Return error packet if client connects to an already connected namespace

Author: miguelgrinberg

src/socketio/base_manager.py

@@ -1,7 +1,7 @@
 import itertools
 import logging
 
-from bidict import bidict
+from bidict import bidict, ValueDuplicationError
 
 default_logger = logging.getLogger('socketio')
 
@@ -51,7 +51,11 @@ def get_participants(self, namespace, room):
     def connect(self, eio_sid, namespace):
         """Register a client connection to a namespace."""
         sid = self.server.eio.generate_id()
-        self.enter_room(sid, namespace, None, eio_sid=eio_sid)
+        try:
+            self.enter_room(sid, namespace, None, eio_sid=eio_sid)
+        except ValueDuplicationError:
+            # already connected
+            return None
         self.enter_room(sid, namespace, sid, eio_sid=eio_sid)
         return sid
 

src/socketio/server.py

@@ -641,6 +641,12 @@ def _handle_connect(self, eio_sid, namespace, data):
         """Handle a client connection request."""
         namespace = namespace or '/'
         sid = self.manager.connect(eio_sid, namespace)
+        if sid is None:
+            self._send_packet(eio_sid, self.packet_class(
+                packet.CONNECT_ERROR, data='Unable to connect',
+                namespace=namespace))
+            return
+
         if self.always_connect:
             self._send_packet(eio_sid, self.packet_class(
                 packet.CONNECT, {'sid': sid}, namespace=namespace))

tests/common/test_server.py

@@ -366,6 +366,19 @@ def test_handle_connect_namespace(self, eio):
         handler.assert_called_once_with('1', 'environ')
         s.eio.send.assert_called_once_with('123', '0/foo,{"sid":"1"}')
 
+    def test_handle_connect_namespace_twice(self, eio):
+        s = server.Server()
+        handler = mock.MagicMock()
+        s.on('connect', handler, namespace='/foo')
+        s._handle_eio_connect('123', 'environ')
+        s._handle_eio_message('123', '0/foo,')
+        s._handle_eio_message('123', '0/foo,')
+        assert s.manager.is_connected('1', '/foo')
+        handler.assert_called_once_with('1', 'environ')
+        s.eio.send.assert_any_call('123', '0/foo,{"sid":"1"}')
+        print(s.eio.send.call_args_list)
+        s.eio.send.assert_any_call('123', '4/foo,"Unable to connect"')
+
     def test_handle_connect_always_connect(self, eio):
         s = server.Server(always_connect=True)
         s.manager.initialize = mock.MagicMock()