python-engineio 4.15.0__tar.gz → 4.15.1__tar.gz

{python_engineio-4.15.0/src/python_engineio.egg-info → python_engineio-4.15.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-engineio
-Version: 4.15.0
+Version: 4.15.1
 Summary: Engine.IO server and client for Python
 Author-email: Miguel Grinberg <miguel.grinberg@gmail.com>
 License-Expression: MIT

{python_engineio-4.15.0 → python_engineio-4.15.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "python-engineio"
-version = "4.15.0"
+version = "4.15.1"
 authors = [{name = "Miguel Grinberg", email = "miguel.grinberg@gmail.com"}]
 description = "Engine.IO server and client for Python"
 classifiers = [

{python_engineio-4.15.0 → python_engineio-4.15.1}/src/engineio/async_server.py

@@ -298,7 +298,13 @@ class AsyncServer(base_server.BaseServer):
                         self._log_error_once(f'{e} {sid}', 'bad-sid')
                         r = self._bad_request(f'{e} {sid}')
                     else:
-                        if socket.upgraded:
+                        if not socket.connected:
+                            # cannot accept requests before connecting
+                            self._log_error_once(
+                                f'Socket for session {sid} is not connected',
+                                'not-connected')
+                            r = self._bad_request('Not connected')
+                        elif socket.upgraded:
                             # cannot accept HTTP requests once upgraded
                             self._log_error_once(
                                 f'Unexpected HTTP request for session {sid}',
@@ -332,7 +338,13 @@ class AsyncServer(base_server.BaseServer):
                 r = self._bad_request(f'Invalid session {sid}')
             else:
                 socket = self._get_socket(sid)
-                if not socket.upgraded:
+                if not socket.connected:
+                    # cannot accept requests before connecting
+                    self._log_error_once(
+                        f'Socket for session {sid} is not connected',
+                        'not-connected')
+                    r = self._bad_request('Not connected')
+                elif not socket.upgraded:
                     try:
                         await socket.handle_post_request(environ)
                         r = self._ok(jsonp_index=jsonp_index)

{python_engineio-4.15.0 → python_engineio-4.15.1}/src/engineio/async_socket.py

@@ -56,8 +56,8 @@ class AsyncSocket(base_socket.BaseSocket):
         """Make sure the client is still sending pings."""
         if self.closed:
             raise exceptions.SocketIsClosedError()
-        if self.last_ping and \
-                time.time() - self.last_ping > self.server.ping_timeout:
+        last_ping = self.last_ping
+        if last_ping and time.time() - last_ping > self.server.ping_timeout:
             self.server.logger.info('%s: Client is gone, closing socket',
                                     self.sid)
             # Passing abort=False here will cause close() to write a

{python_engineio-4.15.0 → python_engineio-4.15.1}/src/engineio/server.py

@@ -276,7 +276,13 @@ class Server(base_server.BaseServer):
                         self._log_error_once(f'{e} {sid}', 'bad-sid')
                         r = self._bad_request(f'{e} {sid}')
                     else:
-                        if socket.upgraded:
+                        if not socket.connected:
+                            # cannot accept requests before connecting
+                            self._log_error_once(
+                                f'Socket for session {sid} is not connected',
+                                'not-connected')
+                            r = self._bad_request('Not connected')
+                        elif socket.upgraded:
                             # cannot accept HTTP requests once upgraded
                             self._log_error_once(
                                 f'Unexpected HTTP request for session {sid}',
@@ -310,7 +316,13 @@ class Server(base_server.BaseServer):
                 r = self._bad_request(f'Invalid session {sid}')
             else:
                 socket = self._get_socket(sid)
-                if not socket.upgraded:
+                if not socket.connected:
+                    # cannot accept requests before connecting
+                    self._log_error_once(
+                        f'Socket for session {sid} is not connected',
+                        'not-connected')
+                    r = self._bad_request('Not connected')
+                elif not socket.upgraded:
                     try:
                         socket.handle_post_request(environ)
                         r = self._ok(jsonp_index=jsonp_index)

{python_engineio-4.15.0 → python_engineio-4.15.1}/src/engineio/socket.py

@@ -57,8 +57,8 @@ class Socket(base_socket.BaseSocket):
         """Make sure the client is still responding to pings."""
         if self.closed:
             raise exceptions.SocketIsClosedError()
-        if self.last_ping and \
-                time.time() - self.last_ping > self.server.ping_timeout:
+        last_ping = self.last_ping
+        if last_ping and time.time() - last_ping > self.server.ping_timeout:
             self.server.logger.info('%s: Client is gone, closing socket',
                                     self.sid)
             # Passing abort=False here will cause close() to write a

{python_engineio-4.15.0 → python_engineio-4.15.1/src/python_engineio.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-engineio
-Version: 4.15.0
+Version: 4.15.1
 Summary: Engine.IO server and client for Python
 Author-email: Miguel Grinberg <miguel.grinberg@gmail.com>
 License-Expression: MIT

{python_engineio-4.15.0 → python_engineio-4.15.1}/src/python_engineio.egg-info/SOURCES.txt

@@ -36,7 +36,7 @@ src/python_engineio.egg-info/dependency_links.txt
 src/python_engineio.egg-info/not-zip-safe
 src/python_engineio.egg-info/requires.txt
 src/python_engineio.egg-info/top_level.txt
-tests/async/.test_client.py.swp
+tests/async/.test_server.py.swp
 tests/async/__init__.py
 tests/async/index.html
 tests/async/test_aiohttp.py

{python_engineio-4.15.0 → python_engineio-4.15.1}/tests/async/test_server.py

@@ -688,6 +688,7 @@ class TestAsyncServer:
         import_module.side_effect = [a]
         s = async_server.AsyncServer()
         s.sockets['foo'] = mock_socket = self._get_mock_socket()
+        mock_socket.connected = True
         mock_socket.upgraded = False
         await s.handle_request('request')
         assert a._async['make_response'].call_args[0][0] == '400 BAD REQUEST'
@@ -701,6 +702,7 @@ class TestAsyncServer:
         import_module.side_effect = [a]
         s = async_server.AsyncServer()
         s.sockets['foo'] = mock_socket = self._get_mock_socket()
+        mock_socket.connected = True
         mock_socket.upgraded = True
         await s.handle_request('request')
         assert a._async['make_response'].call_args[0][0] == '400 BAD REQUEST'
@@ -724,6 +726,7 @@ class TestAsyncServer:
         import_module.side_effect = [a]
         s = async_server.AsyncServer()
         s.sockets['foo'] = self._get_mock_socket()
+        s.sockets['foo'].connected = True
         s.sockets['foo'].upgraded = True
         await s.handle_request('request')
         assert a._async['make_response'].call_args[0][0] == '400 BAD REQUEST'
@@ -757,6 +760,7 @@ class TestAsyncServer:
         import_module.side_effect = [a]
         s = async_server.AsyncServer()
         s.sockets['foo'] = mock_socket = self._get_mock_socket()
+        mock_socket.connected = True
         mock_socket.handle_get_request.return_value = [
             packet.Packet(packet.MESSAGE, data='hello')
         ]
@@ -777,6 +781,7 @@ class TestAsyncServer:
         import_module.side_effect = [a]
         s = async_server.AsyncServer()
         s.sockets['foo'] = mock_socket = self._get_mock_socket()
+        mock_socket.connected = True
         mock_socket.handle_get_request.return_value = 'resp'
         r = await s.handle_request('request')
         assert r == 'resp'
@@ -789,6 +794,7 @@ class TestAsyncServer:
         import_module.side_effect = [a]
         s = async_server.AsyncServer()
         s.sockets['foo'] = mock_socket = self._get_mock_socket()
+        mock_socket.connected = True
 
         async def mock_get_request(*args, **kwargs):
             mock_socket.closed = True
@@ -807,6 +813,7 @@ class TestAsyncServer:
         import_module.side_effect = [a]
         s = async_server.AsyncServer()
         s.sockets['foo'] = mock_socket = self._get_mock_socket()
+        mock_socket.connected = True
 
         async def mock_get_request(*args, **kwargs):
             raise exceptions.QueueEmpty()
@@ -823,10 +830,22 @@ class TestAsyncServer:
         )
         import_module.side_effect = [a]
         s = async_server.AsyncServer()
-        s.sockets['foo'] = self._get_mock_socket()
+        s.sockets['foo'] = mock_socket = self._get_mock_socket()
+        mock_socket.connected = True
         await s.handle_request('request')
         assert a._async['make_response'].call_args[0][0] == '200 OK'
 
+    @mock.patch('importlib.import_module')
+    async def test_post_request_before_connecting(self, import_module):
+        a = self.get_async_mock(
+            {'REQUEST_METHOD': 'POST', 'QUERY_STRING': 'sid=foo'}
+        )
+        import_module.side_effect = [a]
+        s = async_server.AsyncServer()
+        s.sockets['foo'] = self._get_mock_socket()
+        await s.handle_request('request')
+        assert a._async['make_response'].call_args[0][0] == '400 BAD REQUEST'
+
     @mock.patch('importlib.import_module')
     async def test_post_request_error(self, import_module):
         a = self.get_async_mock(
@@ -835,6 +854,7 @@ class TestAsyncServer:
         import_module.side_effect = [a]
         s = async_server.AsyncServer()
         s.sockets['foo'] = mock_socket = self._get_mock_socket()
+        mock_socket.connected = True
 
         async def mock_post_request(*args, **kwargs):
             raise exceptions.ContentTooLongError()

{python_engineio-4.15.0 → python_engineio-4.15.1}/tests/common/test_server.py

@@ -35,6 +35,7 @@ class TestServer:
 
     def _get_mock_socket(self):
         mock_socket = mock.MagicMock()
+        mock_socket.connected = False
         mock_socket.closed = False
         mock_socket.closing = False
         mock_socket.upgraded = False
@@ -862,6 +863,7 @@ class TestServer:
     def test_post_request_after_upgrade(self):
         s = server.Server()
         mock_socket = self._get_mock_socket()
+        mock_socket.connected = True
         mock_socket.upgraded = True
         mock_socket.handle_post_request = mock.MagicMock()
         s.sockets['foo'] = mock_socket
@@ -887,6 +889,7 @@ class TestServer:
     def test_get_request(self):
         s = server.Server()
         mock_socket = self._get_mock_socket()
+        mock_socket.connected = True
         mock_socket.handle_get_request = mock.MagicMock(
             return_value=[packet.Packet(packet.MESSAGE, data='hello')]
         )
@@ -903,6 +906,7 @@ class TestServer:
     def test_get_request_custom_response(self):
         s = server.Server()
         mock_socket = self._get_mock_socket()
+        mock_socket.connected = True
         mock_socket.handle_get_request = mock.MagicMock(side_effect=['resp'])
         s.sockets['foo'] = mock_socket
         environ = {'REQUEST_METHOD': 'GET', 'QUERY_STRING': 'EIO=4&sid=foo'}
@@ -912,6 +916,7 @@ class TestServer:
     def test_get_request_closes_socket(self):
         s = server.Server()
         mock_socket = self._get_mock_socket()
+        mock_socket.connected = True
 
         def mock_get_request(*args, **kwargs):
             mock_socket.closed = True
@@ -927,6 +932,7 @@ class TestServer:
     def test_get_request_error(self):
         s = server.Server()
         mock_socket = self._get_mock_socket()
+        mock_socket.connected = True
         mock_socket.handle_get_request = mock.MagicMock(
             side_effect=[exceptions.QueueEmpty]
         )
@@ -940,6 +946,7 @@ class TestServer:
     def test_get_request_bad_websocket_transport(self):
         s = server.Server()
         mock_socket = self._get_mock_socket()
+        mock_socket.connected = True
         mock_socket.upgraded = False
         s.sockets['foo'] = mock_socket
         environ = {'REQUEST_METHOD': 'GET',
@@ -951,6 +958,7 @@ class TestServer:
     def test_get_request_bad_polling_transport(self):
         s = server.Server()
         mock_socket = self._get_mock_socket()
+        mock_socket.connected = True
         mock_socket.upgraded = True
         s.sockets['foo'] = mock_socket
         environ = {'REQUEST_METHOD': 'GET',
@@ -962,6 +970,7 @@ class TestServer:
     def test_post_request(self):
         s = server.Server()
         mock_socket = self._get_mock_socket()
+        mock_socket.connected = True
         mock_socket.handle_post_request = mock.MagicMock()
         s.sockets['foo'] = mock_socket
         environ = {'REQUEST_METHOD': 'POST', 'QUERY_STRING': 'EIO=4&sid=foo'}
@@ -969,9 +978,20 @@ class TestServer:
         s.handle_request(environ, start_response)
         assert start_response.call_args[0][0] == '200 OK'
 
+    def test_post_request_before_connecting(self):
+        s = server.Server()
+        mock_socket = self._get_mock_socket()
+        mock_socket.handle_post_request = mock.MagicMock()
+        s.sockets['foo'] = mock_socket
+        environ = {'REQUEST_METHOD': 'POST', 'QUERY_STRING': 'EIO=4&sid=foo'}
+        start_response = mock.MagicMock()
+        s.handle_request(environ, start_response)
+        assert start_response.call_args[0][0] == '400 BAD REQUEST'
+
     def test_post_request_error(self):
         s = server.Server()
         mock_socket = self._get_mock_socket()
+        mock_socket.connected = True
         mock_socket.handle_post_request = mock.MagicMock(
             side_effect=[exceptions.EngineIOError]
         )