File 0001-Always-treat-SSLError-timeouts-as-socket-t... of Package python-amqp

Overview Repositories Revisions Requests Users Attributes Meta

File 0001-Always-treat-SSLError-timeouts-as-socket-timeouts-24.patch of Package python-amqp (Revision 0bec345250adbcb8e737d7e79a094889)

Currently displaying revision 0bec345250adbcb8e737d7e79a094889 , Show latest

From bf122a05a21a8cc5bca314b0979f32c8026fc66e Mon Sep 17 00:00:00 2001
From: Dirk Mueller <dmueller@suse.com>
Date: Thu, 31 Jan 2019 15:07:26 +0100
Subject: [PATCH] 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>
---
 amqp/transport.py        |  4 ++++
 t/unit/test_transport.py | 18 +++++++++++++++++-
 2 files changed, 21 insertions(+), 1 deletion(-)

Index: amqp-2.3.2/amqp/transport.py
===================================================================
--- amqp-2.3.2.orig/amqp/transport.py
+++ amqp-2.3.2/amqp/transport.py
@@ -362,6 +362,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:
Index: amqp-2.3.2/t/unit/test_transport.py
===================================================================
--- amqp-2.3.2.orig/t/unit/test_transport.py
+++ amqp-2.3.2/t/unit/test_transport.py
@@ -4,7 +4,7 @@ import errno
 import socket
 
 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
@@ -506,6 +506,22 @@ class test_SSLTransport:
         self.t._shutdown_transport()
         assert self.t.sock is sock.unwrap()
 
+    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:

Places

File 0001-Always-treat-SSLError-timeouts-as-socket-timeouts-24.patch of Package python-amqp (Revision 0bec345250adbcb8e737d7e79a094889)

Places