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

python_engineio-4.15.0/PKG-INFO

@@ -0,0 +1,61 @@
+Metadata-Version: 2.4
+Name: python-engineio
+Version: 4.15.0
+Summary: Engine.IO server and client for Python
+Author-email: Miguel Grinberg <miguel.grinberg@gmail.com>
+License-Expression: MIT
+Project-URL: Homepage, https://code.miguelgrinberg.com/miguelgrinberg/python-engineio
+Project-URL: Documentation, https://python-engineio.readthedocs.io/
+Project-URL: Source Code, https://code.miguelgrinberg.com/miguelgrinberg/python-engineio
+Project-URL: Issue Tracker, https://code.miguelgrinberg.com/miguelgrinberg/python-engineio/issues
+Project-URL: Changelog, https://code.miguelgrinberg.com/miguelgrinberg/python-engineio/src/branch/main/CHANGES.md
+Project-URL: Funding, https://code.miguelgrinberg.com/miguelgrinberg/python-engineio#sponsor-this-project
+Classifier: Environment :: Web Environment
+Classifier: Intended Audience :: Developers
+Classifier: Programming Language :: Python :: 3
+Classifier: Operating System :: OS Independent
+Requires-Python: >=3.8
+Description-Content-Type: text/markdown
+License-File: LICENSE
+Requires-Dist: simple-websocket>=0.10.0
+Provides-Extra: client
+Requires-Dist: requests>=2.21.0; extra == "client"
+Requires-Dist: websocket-client>=0.54.0; extra == "client"
+Provides-Extra: asyncio-client
+Requires-Dist: aiohttp>=3.11; extra == "asyncio-client"
+Provides-Extra: dev
+Requires-Dist: tox; extra == "dev"
+Provides-Extra: docs
+Requires-Dist: sphinx; extra == "docs"
+Requires-Dist: furo; extra == "docs"
+Dynamic: license-file
+
+python-engineio
+===============
+
+[![tests](https://code.miguelgrinberg.com/miguelgrinberg/python-engineio/badges/workflows/tests.yml/badge.svg)](https://code.miguelgrinberg.com/miguelgrinberg/python-engineio/actions)
+
+Python implementation of the `Engine.IO` realtime client and server.
+
+Resources
+---------
+
+- [git](https://code.miguelgrinberg.com/miguelgrinberg/python-engineio)
+- [Change Log](https://code.miguelgrinberg.com/miguelgrinberg/python-engineio/src/branch/main/CHANGES.md)
+- [Documentation](https://python-engineio.readthedocs.io/)
+- [PyPI](https://pypi.python.org/pypi/python-engineio)
+- [Contributor's guide](CONTRIBUTING.md)
+- [Security policy](SECURITY.md)
+
+Sponsor this project
+--------------------
+
+This project relies on contributions from its users. If you benefit from it please consider making a single or ongoing monetary contribution in one of the following platforms:
+
+- [Github Sponsors](https://github.com/sponsors/miguelgrinberg)
+- [Patreon](https://patreon.com/miguelgrinberg)
+- [Buy me a Coffee](https://buymeacoffee.com/miguelgrinberg)
+- [thanks.dev](https://thanks.dev/u/gh/miguelgrinberg)
+- [PayPal](https://paypal.me/miguelgrinberg)
+
+Thank you!

python_engineio-4.15.0/README.md

@@ -0,0 +1,29 @@
+python-engineio
+===============
+
+[![tests](https://code.miguelgrinberg.com/miguelgrinberg/python-engineio/badges/workflows/tests.yml/badge.svg)](https://code.miguelgrinberg.com/miguelgrinberg/python-engineio/actions)
+
+Python implementation of the `Engine.IO` realtime client and server.
+
+Resources
+---------
+
+- [git](https://code.miguelgrinberg.com/miguelgrinberg/python-engineio)
+- [Change Log](https://code.miguelgrinberg.com/miguelgrinberg/python-engineio/src/branch/main/CHANGES.md)
+- [Documentation](https://python-engineio.readthedocs.io/)
+- [PyPI](https://pypi.python.org/pypi/python-engineio)
+- [Contributor's guide](CONTRIBUTING.md)
+- [Security policy](SECURITY.md)
+
+Sponsor this project
+--------------------
+
+This project relies on contributions from its users. If you benefit from it please consider making a single or ongoing monetary contribution in one of the following platforms:
+
+- [Github Sponsors](https://github.com/sponsors/miguelgrinberg)
+- [Patreon](https://patreon.com/miguelgrinberg)
+- [Buy me a Coffee](https://buymeacoffee.com/miguelgrinberg)
+- [thanks.dev](https://thanks.dev/u/gh/miguelgrinberg)
+- [PayPal](https://paypal.me/miguelgrinberg)
+
+Thank you!

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

@@ -1,7 +1,6 @@
 [project]
 name = "python-engineio"
-version = "4.13.5"
-license = {text = "MIT"}
+version = "4.15.0"
 authors = [{name = "Miguel Grinberg", email = "miguel.grinberg@gmail.com"}]
 description = "Engine.IO server and client for Python"
 classifiers = [
@@ -10,6 +9,7 @@ classifiers = [
     "Programming Language :: Python :: 3",
     "Operating System :: OS Independent",
 ]
+license = "MIT"
 requires-python = ">=3.8"
 dependencies = ["simple-websocket >= 0.10.0"]
 
@@ -18,8 +18,12 @@ file = "README.md"
 content-type = "text/markdown"
 
 [project.urls]
-Homepage = "https://github.com/miguelgrinberg/python-engineio"
-"Bug Tracker" = "https://github.com/miguelgrinberg/python-engineio/issues"
+Homepage = "https://code.miguelgrinberg.com/miguelgrinberg/python-engineio"
+Documentation = "https://python-engineio.readthedocs.io/"
+"Source Code" = "https://code.miguelgrinberg.com/miguelgrinberg/python-engineio"
+"Issue Tracker" = "https://code.miguelgrinberg.com/miguelgrinberg/python-engineio/issues"
+Changelog = "https://code.miguelgrinberg.com/miguelgrinberg/python-engineio/src/branch/main/CHANGES.md"
+Funding = "https://code.miguelgrinberg.com/miguelgrinberg/python-engineio#sponsor-this-project"
 
 [project.optional-dependencies]
 client = [

{python_engineio-4.13.5 → python_engineio-4.15.0}/src/engineio/async_client.py

@@ -226,6 +226,7 @@ class AsyncClient(base_client.BaseClient):
         if not self.external_http:  # pragma: no cover
             if self.http and not self.http.closed:
                 await self.http.close()
+                self.http = None
 
     def __del__(self):  # pragma: no cover
         # try to close the aiohttp session if it is still open
@@ -284,7 +285,13 @@ class AsyncClient(base_client.BaseClient):
 
         self.state = 'connected'
         base_client.connected_clients.append(self)
-        await self._trigger_event('connect', run_async=False)
+        try:
+            await self._trigger_event('connect', run_async=False)
+        except Exception as exc:
+            base_client.connected_clients.remove(self)
+            await self._reset()
+            raise exceptions.ConnectionError(
+                'Connect handler failed: ' + str(exc))
 
         for pkt in p.packets[1:]:
             await self._receive_packet(pkt)
@@ -317,8 +324,13 @@ class AsyncClient(base_client.BaseClient):
             self.logger.info(
                 'Attempting WebSocket connection to ' + websocket_url)
 
-        if self.http is None or self.http.closed:  # pragma: no cover
-            self.http = aiohttp.ClientSession()
+        if self.http is None or self.http.closed:
+            if self.http_factory:
+                self.http = self.http_factory()
+                if inspect.iscoroutine(self.http):
+                    self.http = await self.http
+            else:
+                self.http = aiohttp.ClientSession()
 
         # extract any new cookies passed in a header so that they can also be
         # sent the the WebSocket route
@@ -406,7 +418,13 @@ class AsyncClient(base_client.BaseClient):
 
             self.state = 'connected'
             base_client.connected_clients.append(self)
-            await self._trigger_event('connect', run_async=False)
+            try:
+                await self._trigger_event('connect', run_async=False)
+            except Exception as exc:
+                base_client.connected_clients.remove(self)
+                await self._reset()
+                raise exceptions.ConnectionError(
+                    'Connect handler failed: ' + str(exc))
 
         self.ws = ws
         self.write_loop_task = self.start_background_task(self._write_loop)
@@ -446,12 +464,17 @@ class AsyncClient(base_client.BaseClient):
 
     async def _send_request(
             self, method, url, headers=None, body=None,
-            timeout=None):  # pragma: no cover
+            timeout=None):
         if self.http is None or self.http.closed:
-            self.http = aiohttp.ClientSession()
+            if self.http_factory:
+                self.http = self.http_factory()
+                if inspect.iscoroutine(self.http):
+                    self.http = await self.http
+            else:
+                self.http = aiohttp.ClientSession()
         http_method = getattr(self.http, method.lower())
 
-        try:
+        try:  # pragma: no cover
             if not self.ssl_verify:
                 return await http_method(
                     url, headers=headers, data=body,
@@ -461,7 +484,8 @@ class AsyncClient(base_client.BaseClient):
                     url, headers=headers, data=body,
                     timeout=aiohttp.ClientTimeout(total=timeout))
 
-        except (aiohttp.ClientError, asyncio.TimeoutError) as exc:
+        except (aiohttp.ClientError, asyncio.TimeoutError) \
+                as exc:  # pragma: no cover
             self.logger.info('HTTP %s request to %s failed with error %s.',
                              method, url, exc)
             return str(exc)
@@ -495,9 +519,9 @@ class AsyncClient(base_client.BaseClient):
                     except:
                         self.logger.exception(event + ' async handler error')
                         if event == 'connect':
-                            # if connect handler raised error we reject the
-                            # connection
-                            return False
+                            # for the connection event we reraise the exception
+                            # to stop the connection from completing
+                            raise
             else:
                 if run_async:
                     async def async_handler():
@@ -522,9 +546,9 @@ class AsyncClient(base_client.BaseClient):
                     except:
                         self.logger.exception(event + ' handler error')
                         if event == 'connect':
-                            # if connect handler raised error we reject the
-                            # connection
-                            return False
+                            # for the connection event we reraise the exception
+                            # to stop the connection from completing
+                            raise
         return ret
 
     async def _read_loop_polling(self):

{python_engineio-4.13.5 → python_engineio-4.15.0}/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 self.transport(sid) != transport and \
+                        if socket.upgraded:
+                            # cannot accept HTTP requests once upgraded
+                            self._log_error_once(
+                                f'Unexpected HTTP request for session {sid}',
+                                'unexpected-http')
+                            r = self._bad_request('Unexpected HTTP request')
+                        elif transport != 'polling' and \
                                 transport != upgrade_header:
                             self._log_error_once(
                                 f'Invalid transport for session {sid}',
@@ -326,18 +332,25 @@ class AsyncServer(base_server.BaseServer):
                 r = self._bad_request(f'Invalid session {sid}')
             else:
                 socket = self._get_socket(sid)
-                try:
-                    await socket.handle_post_request(environ)
-                    r = self._ok(jsonp_index=jsonp_index)
-                except exceptions.EngineIOError:
-                    if sid in self.sockets:  # pragma: no cover
-                        await self.disconnect(sid)
-                    r = self._bad_request()
-                except:  # pragma: no cover
-                    # for any other unexpected errors, we log the error
-                    # and keep going
-                    self.logger.exception('post request handler error')
-                    r = self._ok(jsonp_index=jsonp_index)
+                if not socket.upgraded:
+                    try:
+                        await socket.handle_post_request(environ)
+                        r = self._ok(jsonp_index=jsonp_index)
+                    except exceptions.EngineIOError:
+                        if sid in self.sockets:  # pragma: no cover
+                            await self.disconnect(sid)
+                            r = self._bad_request()
+                    except:  # pragma: no cover
+                        # for any other unexpected errors, we log the error
+                        # and keep going
+                        self.logger.exception('post request handler error')
+                        r = self._ok(jsonp_index=jsonp_index)
+                else:
+                    # cannot accept HTTP requests once upgraded
+                    self._log_error_once(
+                        f'Unexpected HTTP request for session {sid}',
+                        'unexpected-http')
+                    r = self._bad_request('Unexpected HTTP request')
         elif method == 'OPTIONS':
             r = self._ok()
         else:

{python_engineio-4.13.5 → python_engineio-4.15.0}/src/engineio/base_client.py

@@ -55,8 +55,14 @@ class BaseClient:
         self.upgrades = None
         self.ping_interval = None
         self.ping_timeout = None
-        self.http = http_session
-        self.external_http = http_session is not None
+        self.http = None
+        self.http_factory = None
+        if http_session is not None:
+            if callable(http_session):
+                self.http_factory = http_session
+            else:
+                self.http = http_session
+        self.external_http = self.http is not None
         self.handle_sigint = handle_sigint
         self.ws = None
         self.read_loop_task = None

{python_engineio-4.13.5 → python_engineio-4.15.0}/src/engineio/client.py

@@ -183,6 +183,8 @@ class Client(base_client.BaseClient):
                 self.queue.task_done()
             except self.queue_empty:
                 break
+        if not self.external_http:  # pragma: no cover
+            self.http = None
 
     def _connect_polling(self, url, headers, engineio_path):
         """Establish a long-polling connection to the Engine.IO server."""
@@ -229,7 +231,13 @@ class Client(base_client.BaseClient):
 
         self.state = 'connected'
         base_client.connected_clients.append(self)
-        self._trigger_event('connect', run_async=False)
+        try:
+            self._trigger_event('connect', run_async=False, reraise=True)
+        except Exception as exc:
+            base_client.connected_clients.remove(self)
+            self._reset()
+            raise exceptions.ConnectionError(
+                'Connect handler failed: ' + str(exc))
 
         for pkt in p.packets[1:]:
             self._receive_packet(pkt)
@@ -268,6 +276,8 @@ class Client(base_client.BaseClient):
         # so that they are preserved when connecting to the WebSocket route
         cookies = None
         extra_options = {}
+        if self.http is None and self.http_factory:
+            self.http = self.http_factory()
         if self.http:
             # cookies
             ck = SimpleCookie()
@@ -403,7 +413,13 @@ class Client(base_client.BaseClient):
 
             self.state = 'connected'
             base_client.connected_clients.append(self)
-            self._trigger_event('connect', run_async=False)
+            try:
+                self._trigger_event('connect', run_async=False, reraise=True)
+            except Exception as exc:
+                base_client.connected_clients.remove(self)
+                self._reset()
+                raise exceptions.ConnectionError(
+                    'Connect handler failed: ' + str(exc))
         self.ws = ws
         self.ws.settimeout(self.ping_interval + self.ping_timeout)
 
@@ -446,7 +462,10 @@ class Client(base_client.BaseClient):
             self, method, url, headers=None, body=None,
             timeout=None):  # pragma: no cover
         if self.http is None:
-            self.http = requests.Session()
+            if self.http_factory:
+                self.http = self.http_factory()
+            else:
+                self.http = requests.Session()
         if not self.ssl_verify:
             self.http.verify = False
         try:
@@ -477,6 +496,10 @@ class Client(base_client.BaseClient):
                             raise
                 except:
                     self.logger.exception(event + ' handler error')
+                    if event == 'connect':
+                        # for the connection event we reraise the exception
+                        # to stop the connection from completing
+                        raise
 
     def _read_loop_polling(self):
         """Read packets by polling the Engine.IO server."""

{python_engineio-4.13.5 → python_engineio-4.15.0}/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 self.transport(sid) != transport and \
+                        if socket.upgraded:
+                            # cannot accept HTTP requests once upgraded
+                            self._log_error_once(
+                                f'Unexpected HTTP request for session {sid}',
+                                'unexpected-http')
+                            r = self._bad_request('Unexpected HTTP request')
+                        elif transport != 'polling' and \
                                 transport != upgrade_header:
                             self._log_error_once(
                                 f'Invalid transport for session {sid}',
@@ -304,18 +310,25 @@ class Server(base_server.BaseServer):
                 r = self._bad_request(f'Invalid session {sid}')
             else:
                 socket = self._get_socket(sid)
-                try:
-                    socket.handle_post_request(environ)
-                    r = self._ok(jsonp_index=jsonp_index)
-                except exceptions.EngineIOError:
-                    if sid in self.sockets:  # pragma: no cover
-                        self.disconnect(sid)
-                    r = self._bad_request()
-                except:  # pragma: no cover
-                    # for any other unexpected errors, we log the error
-                    # and keep going
-                    self.logger.exception('post request handler error')
-                    r = self._ok(jsonp_index=jsonp_index)
+                if not socket.upgraded:
+                    try:
+                        socket.handle_post_request(environ)
+                        r = self._ok(jsonp_index=jsonp_index)
+                    except exceptions.EngineIOError:
+                        if sid in self.sockets:  # pragma: no cover
+                            self.disconnect(sid)
+                        r = self._bad_request()
+                    except:  # pragma: no cover
+                        # for any other unexpected errors, we log the error
+                        # and keep going
+                        self.logger.exception('post request handler error')
+                        r = self._ok(jsonp_index=jsonp_index)
+                else:
+                    # cannot accept HTTP requests once upgraded
+                    self._log_error_once(
+                        f'Unexpected HTTP request for session {sid}',
+                        'unexpected-http')
+                    r = self._bad_request('Unexpected HTTP request')
         elif method == 'OPTIONS':
             r = self._ok()
         else:

{python_engineio-4.13.5 → python_engineio-4.15.0}/src/engineio/static_files.py

@@ -35,6 +35,8 @@ def get_static_file(path, static_files):
             elif path + '/' in static_files:
                 f = static_files[path + '/']
                 break
+    if '../' in extra_path:
+        return None
     if f:
         if isinstance(f, str):
             f = {'filename': f}

python_engineio-4.15.0/src/python_engineio.egg-info/PKG-INFO

@@ -0,0 +1,61 @@
+Metadata-Version: 2.4
+Name: python-engineio
+Version: 4.15.0
+Summary: Engine.IO server and client for Python
+Author-email: Miguel Grinberg <miguel.grinberg@gmail.com>
+License-Expression: MIT
+Project-URL: Homepage, https://code.miguelgrinberg.com/miguelgrinberg/python-engineio
+Project-URL: Documentation, https://python-engineio.readthedocs.io/
+Project-URL: Source Code, https://code.miguelgrinberg.com/miguelgrinberg/python-engineio
+Project-URL: Issue Tracker, https://code.miguelgrinberg.com/miguelgrinberg/python-engineio/issues
+Project-URL: Changelog, https://code.miguelgrinberg.com/miguelgrinberg/python-engineio/src/branch/main/CHANGES.md
+Project-URL: Funding, https://code.miguelgrinberg.com/miguelgrinberg/python-engineio#sponsor-this-project
+Classifier: Environment :: Web Environment
+Classifier: Intended Audience :: Developers
+Classifier: Programming Language :: Python :: 3
+Classifier: Operating System :: OS Independent
+Requires-Python: >=3.8
+Description-Content-Type: text/markdown
+License-File: LICENSE
+Requires-Dist: simple-websocket>=0.10.0
+Provides-Extra: client
+Requires-Dist: requests>=2.21.0; extra == "client"
+Requires-Dist: websocket-client>=0.54.0; extra == "client"
+Provides-Extra: asyncio-client
+Requires-Dist: aiohttp>=3.11; extra == "asyncio-client"
+Provides-Extra: dev
+Requires-Dist: tox; extra == "dev"
+Provides-Extra: docs
+Requires-Dist: sphinx; extra == "docs"
+Requires-Dist: furo; extra == "docs"
+Dynamic: license-file
+
+python-engineio
+===============
+
+[![tests](https://code.miguelgrinberg.com/miguelgrinberg/python-engineio/badges/workflows/tests.yml/badge.svg)](https://code.miguelgrinberg.com/miguelgrinberg/python-engineio/actions)
+
+Python implementation of the `Engine.IO` realtime client and server.
+
+Resources
+---------
+
+- [git](https://code.miguelgrinberg.com/miguelgrinberg/python-engineio)
+- [Change Log](https://code.miguelgrinberg.com/miguelgrinberg/python-engineio/src/branch/main/CHANGES.md)
+- [Documentation](https://python-engineio.readthedocs.io/)
+- [PyPI](https://pypi.python.org/pypi/python-engineio)
+- [Contributor's guide](CONTRIBUTING.md)
+- [Security policy](SECURITY.md)
+
+Sponsor this project
+--------------------
+
+This project relies on contributions from its users. If you benefit from it please consider making a single or ongoing monetary contribution in one of the following platforms:
+
+- [Github Sponsors](https://github.com/sponsors/miguelgrinberg)
+- [Patreon](https://patreon.com/miguelgrinberg)
+- [Buy me a Coffee](https://buymeacoffee.com/miguelgrinberg)
+- [thanks.dev](https://thanks.dev/u/gh/miguelgrinberg)
+- [PayPal](https://paypal.me/miguelgrinberg)
+
+Thank you!

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

@@ -36,6 +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/__init__.py
 tests/async/index.html
 tests/async/test_aiohttp.py

{python_engineio-4.13.5 → python_engineio-4.15.0}/tests/async/test_asgi.py

@@ -147,6 +147,8 @@ class TestAsgi:
                          'Not Found')
         await check_path('/bar/foo', 404, 'text/plain', 'Not Found')
         await check_path('', 404, 'text/plain', 'Not Found')
+        await check_path('/static/../../LICENSE', 404, 'text/plain',
+                         'Not Found')
 
         app.static_files[''] = 'index.html'
         await check_path('/static/test/', 200, 'text/html', '<html></html>\n')