Fix: check redis response type

celery · Sep 16, 2021 · 580b521 · 580b521
1 parent 07bab02
commit 580b521
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/kombu/transport/redis.py b/kombu/transport/redis.py
@@ -856,7 +856,7 @@ def _receive_one(self, c):
         except self.connection_errors:
             self._in_listen = None
             raise
-        if response is not None:
+        if isinstance(response, (list, tuple)):
             payload = self._handle_message(c, response)
             if bytes_to_str(payload['type']).endswith('message'):
                 channel = bytes_to_str(payload['channel'])

diff --git a/t/unit/transport/test_redis.py b/t/unit/transport/test_redis.py
@@ -576,6 +576,12 @@ def test_receive_different_message_Type(self):
 
         assert self.channel._receive_one(self.channel.subclient) is None
 
+    def test_receive_invalid_response_type(self):
+        s = self.channel.subclient = Mock()
+        for resp in ['foo', None]:
+            s.parse_response.return_value = resp
+            assert self.channel._receive_one(self.channel.subclient) is None
+
     def test_receive_connection_has_gone(self):
         def _receive_one(c):
             c.connection = None