Do not allow emits on a namespace that is not connected (Fixes miguelgrinberg#325)

miguelgrinberg · miguelgrinberg · commit f2c1cf7f04ce · 2019-08-04T14:37:02.000+01:00
diff --git a/socketio/asyncio_client.py b/socketio/asyncio_client.py
@@ -142,6 +142,9 @@ async def emit(self, event, data=None, namespace=None, callback=None):
         Note: this method is a coroutine.
         """
         namespace = namespace or '/'
+        if namespace != '/' and namespace not in self.namespaces:
+            raise exceptions.BadNamespaceError(
+                namespace + ' is not a connected namespace.')
         self.logger.info('Emitting event "%s" [%s]', event, namespace)
         if callback is not None:
             id = self._generate_ack_id(namespace, callback)
diff --git a/socketio/client.py b/socketio/client.py
@@ -298,6 +298,9 @@ def emit(self, event, data=None, namespace=None, callback=None):
                          when addressing an individual client.
         """
         namespace = namespace or '/'
+        if namespace != '/' and namespace not in self.namespaces:
+            raise exceptions.BadNamespaceError(
+                namespace + ' is not a connected namespace.')
         self.logger.info('Emitting event "%s" [%s]', event, namespace)
         if callback is not None:
             id = self._generate_ack_id(namespace, callback)
diff --git a/socketio/exceptions.py b/socketio/exceptions.py
@@ -24,3 +24,7 @@ def __init__(self, *args):
 
 class TimeoutError(SocketIOError):
     pass
+
+
+class BadNamespaceError(SocketIOError):
+    pass
diff --git a/tests/asyncio/test_asyncio_client.py b/tests/asyncio/test_asyncio_client.py
@@ -194,6 +194,7 @@ def test_emit_two_arguments(self):
 
     def test_emit_namespace(self):
         c = asyncio_client.AsyncClient()
+        c.namespaces = ['/foo']
         c._send_packet = AsyncMock()
         _run(c.emit('foo', namespace='/foo'))
         expected_packet = packet.Packet(packet.EVENT, namespace='/foo',
@@ -202,6 +203,12 @@ def test_emit_namespace(self):
         self.assertEqual(c._send_packet.mock.call_args_list[0][0][0].encode(),
                          expected_packet.encode())
 
+    def test_emit_unknown_namespace(self):
+        c = asyncio_client.AsyncClient()
+        c.namespaces = ['/foo']
+        self.assertRaises(exceptions.BadNamespaceError, _run,
+                          c.emit('foo', namespace='/bar'))
+
     def test_emit_with_callback(self):
         c = asyncio_client.AsyncClient()
         c._send_packet = AsyncMock()
@@ -216,6 +223,7 @@ def test_emit_with_callback(self):
 
     def test_emit_namespace_with_callback(self):
         c = asyncio_client.AsyncClient()
+        c.namespaces = ['/foo']
         c._send_packet = AsyncMock()
         c._generate_ack_id = mock.MagicMock(return_value=123)
         _run(c.emit('foo', namespace='/foo', callback='cb'))
diff --git a/tests/common/test_client.py b/tests/common/test_client.py
@@ -288,6 +288,7 @@ def test_emit_two_arguments(self):
 
     def test_emit_namespace(self):
         c = client.Client()
+        c.namespaces = ['/foo']
         c._send_packet = mock.MagicMock()
         c.emit('foo', namespace='/foo')
         expected_packet = packet.Packet(packet.EVENT, namespace='/foo',
@@ -296,6 +297,12 @@ def test_emit_namespace(self):
         self.assertEqual(c._send_packet.call_args_list[0][0][0].encode(),
                          expected_packet.encode())
 
+    def test_emit_unknown_namespace(self):
+        c = client.Client()
+        c.namespaces = ['/foo']
+        self.assertRaises(exceptions.BadNamespaceError, c.emit, 'foo',
+                          namespace='/bar')
+
     def test_emit_with_callback(self):
         c = client.Client()
         c._send_packet = mock.MagicMock()
@@ -310,6 +317,7 @@ def test_emit_with_callback(self):
 
     def test_emit_namespace_with_callback(self):
         c = client.Client()
+        c.namespaces = ['/foo']
         c._send_packet = mock.MagicMock()
         c._generate_ack_id = mock.MagicMock(return_value=123)
         c.emit('foo', namespace='/foo', callback='cb')
