python-engineio 4.11.1__tar.gz → 4.12.0__tar.gz

{python_engineio-4.11.1/src/python_engineio.egg-info → python_engineio-4.12.0}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: python-engineio
-Version: 4.11.1
+Version: 4.12.0
 Summary: Engine.IO server and client for Python
 Author-email: Miguel Grinberg <miguel.grinberg@gmail.com>
 Project-URL: Homepage, https://github.com/miguelgrinberg/python-engineio
@@ -21,6 +21,7 @@ Provides-Extra: asyncio-client
 Requires-Dist: aiohttp>=3.4; extra == "asyncio-client"
 Provides-Extra: docs
 Requires-Dist: sphinx; extra == "docs"
+Dynamic: license-file
 
 python-engineio
 ===============

{python_engineio-4.11.1 → python_engineio-4.12.0}/pyproject.toml

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

{python_engineio-4.11.1 → python_engineio-4.12.0}/src/engineio/base_server.py

@@ -282,29 +282,33 @@ class BaseServer:
                 'response': message.encode('utf-8')}
 
     def _cors_allowed_origins(self, environ):
-        default_origins = []
-        if 'wsgi.url_scheme' in environ and 'HTTP_HOST' in environ:
-            default_origins.append('{scheme}://{host}'.format(
-                scheme=environ['wsgi.url_scheme'], host=environ['HTTP_HOST']))
-            if 'HTTP_X_FORWARDED_PROTO' in environ or \
-                    'HTTP_X_FORWARDED_HOST' in environ:
-                scheme = environ.get(
-                    'HTTP_X_FORWARDED_PROTO',
-                    environ['wsgi.url_scheme']).split(',')[0].strip()
-                default_origins.append('{scheme}://{host}'.format(
-                    scheme=scheme, host=environ.get(
-                        'HTTP_X_FORWARDED_HOST', environ['HTTP_HOST']).split(
-                            ',')[0].strip()))
         if self.cors_allowed_origins is None:
-            allowed_origins = default_origins
+            allowed_origins = []
+            if 'wsgi.url_scheme' in environ and 'HTTP_HOST' in environ:
+                allowed_origins.append('{scheme}://{host}'.format(
+                    scheme=environ['wsgi.url_scheme'],
+                    host=environ['HTTP_HOST']))
+                if 'HTTP_X_FORWARDED_PROTO' in environ or \
+                        'HTTP_X_FORWARDED_HOST' in environ:
+                    scheme = environ.get(
+                        'HTTP_X_FORWARDED_PROTO',
+                        environ['wsgi.url_scheme']).split(',')[0].strip()
+                    allowed_origins.append('{scheme}://{host}'.format(
+                        scheme=scheme, host=environ.get(
+                            'HTTP_X_FORWARDED_HOST',
+                            environ['HTTP_HOST']).split(
+                                ',')[0].strip()))
         elif self.cors_allowed_origins == '*':
             allowed_origins = None
         elif isinstance(self.cors_allowed_origins, str):
             allowed_origins = [self.cors_allowed_origins]
         elif callable(self.cors_allowed_origins):
             origin = environ.get('HTTP_ORIGIN')
-            allowed_origins = [origin] \
-                if self.cors_allowed_origins(origin) else []
+            try:
+                is_allowed = self.cors_allowed_origins(origin, environ)
+            except TypeError:
+                is_allowed = self.cors_allowed_origins(origin)
+            allowed_origins = [origin] if is_allowed else []
         else:
             allowed_origins = self.cors_allowed_origins
         return allowed_origins

{python_engineio-4.11.1 → python_engineio-4.12.0}/src/engineio/packet.py

@@ -72,11 +72,11 @@ class Packet:
             else:
                 self.packet_type = int(encoded_packet[0])
                 try:
-                    self.data = self.json.loads(encoded_packet[1:])
-                    if isinstance(self.data, int):
+                    if encoded_packet[1].isnumeric():
                         # do not allow integer payloads, see
                         # github.com/miguelgrinberg/python-engineio/issues/75
                         # for background on this decision
                         raise ValueError
-                except ValueError:
+                    self.data = self.json.loads(encoded_packet[1:])
+                except (ValueError, IndexError):
                     self.data = encoded_packet[1:]

{python_engineio-4.11.1 → python_engineio-4.12.0}/src/engineio/socket.py

@@ -250,6 +250,7 @@ class Socket(base_socket.BaseSocket):
 
         self.queue.put(None)  # unlock the writer task so that it can exit
         writer_task.join()
-        self.close(wait=False, abort=True)
+        self.close(wait=False, abort=True,
+                   reason=self.server.reason.TRANSPORT_CLOSE)
 
         return []

{python_engineio-4.11.1 → python_engineio-4.12.0/src/python_engineio.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: python-engineio
-Version: 4.11.1
+Version: 4.12.0
 Summary: Engine.IO server and client for Python
 Author-email: Miguel Grinberg <miguel.grinberg@gmail.com>
 Project-URL: Homepage, https://github.com/miguelgrinberg/python-engineio
@@ -21,6 +21,7 @@ Provides-Extra: asyncio-client
 Requires-Dist: aiohttp>=3.4; extra == "asyncio-client"
 Provides-Extra: docs
 Requires-Dist: sphinx; extra == "docs"
+Dynamic: license-file
 
 python-engineio
 ===============

{python_engineio-4.11.1 → python_engineio-4.12.0}/tests/common/test_socket.py

@@ -340,7 +340,7 @@ class TestSocket:
             [
                 mock.call('message', 'sid', 'foo', run_async=True),
                 mock.call('disconnect', 'sid',
-                          mock_server.reason.SERVER_DISCONNECT,
+                          mock_server.reason.TRANSPORT_CLOSE,
                           run_async=False)
             ]
         )
@@ -375,7 +375,7 @@ class TestSocket:
             [
                 mock.call('message', 'sid', 'foo', run_async=True),
                 mock.call('disconnect', 'sid',
-                          mock_server.reason.SERVER_DISCONNECT,
+                          mock_server.reason.TRANSPORT_CLOSE,
                           run_async=False)
             ]
         )
@@ -494,7 +494,7 @@ class TestSocket:
             [
                 mock.call('message', 'sid', foo, run_async=True),
                 mock.call('disconnect', 'sid',
-                          mock_server.reason.SERVER_DISCONNECT,
+                          mock_server.reason.TRANSPORT_CLOSE,
                           run_async=False)
             ]
         )