Merge branch 'MagicStack:master' into master

Author: Vizonex

.github/workflows/release.yml

@@ -76,7 +76,13 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, macos-latest]
-        cibw_python: ["cp38-*", "cp39-*", "cp310-*", "cp311-*", "cp312-*"]
+        cibw_python:
+        - "cp38-*"
+        - "cp39-*"
+        - "cp310-*"
+        - "cp311-*"
+        - "cp312-*"
+        - "cp313-*"
         cibw_arch: ["x86_64", "aarch64", "universal2"]
         exclude:
           - os: ubuntu-latest
@@ -108,7 +114,7 @@ jobs:
       run: |
         brew install gnu-sed libtool autoconf automake
 
-    - uses: pypa/cibuildwheel@fff9ec32ed25a9c576750c91e06b410ed0c15db7  # v2.16.2
+    - uses: pypa/cibuildwheel@7940a4c0e76eb2030e473a5f864f291f63ee879b  # v2.21.3
       env:
         CIBW_BUILD_VERBOSITY: 1
         CIBW_BUILD: ${{ matrix.cibw_python }}

.github/workflows/tests.yml

@@ -13,8 +13,15 @@ jobs:
   test:
     runs-on: ${{ matrix.os }}
     strategy:
+      fail-fast: false
       matrix:
-        python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
+        python-version:
+        - "3.8"
+        - "3.9"
+        - "3.10"
+        - "3.11"
+        - "3.12"
+        - "3.13"
         os: [ubuntu-latest, macos-latest]
 
     env:
@@ -41,6 +48,7 @@ jobs:
       if: steps.release.outputs.version == 0
       with:
         python-version: ${{ matrix.python-version }}
+        allow-prereleases: true
 
     - name: Install macOS deps
       if: matrix.os == 'macos-latest' && steps.release.outputs.version == 0
@@ -50,16 +58,15 @@ jobs:
     - name: Install Python Deps
       if: steps.release.outputs.version == 0
       run: |
-        pip install -e .[test]
+        pip install -e .[test,dev]
 
     - name: Test
       if: steps.release.outputs.version == 0
       run: |
         make test
 
     - name: Test (debug build)
-      # XXX Re-enable 3.12 once we migrate to Cython 3
-      if: steps.release.outputs.version == 0 && matrix.python-version != '3.12'
+      if: steps.release.outputs.version == 0
       run: |
         make distclean && make debug && make test
 

Makefile

@@ -9,7 +9,7 @@ _default: compile
 
 
 clean:
-	rm -fr dist/ doc/_build/ *.egg-info uvloop/loop.*.pyd
+	rm -fr dist/ doc/_build/ *.egg-info uvloop/loop.*.pyd uvloop/loop_d.*.pyd
 	rm -fr uvloop/*.c uvloop/*.html uvloop/*.so
 	rm -fr uvloop/handles/*.html uvloop/includes/*.html
 	find . -name '__pycache__' | xargs rm -rf

README.rst

@@ -109,7 +109,7 @@ To build uvloop, you'll need Python 3.8 or greater:
 
    .. code::
 
-    $ python3.7 -m venv uvloop-dev
+    $ python3 -m venv uvloop-dev
     $ source uvloop-dev/bin/activate
 
 3. Install development dependencies:

pyproject.toml

@@ -24,6 +24,7 @@ classifiers = [
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
+    "Programming Language :: Python :: 3.13",
     "Programming Language :: Python :: Implementation :: CPython",
     "Topic :: System :: Networking",
 ]
@@ -36,14 +37,16 @@ test = [
     # pycodestyle is a dependency of flake8, but it must be frozen because
     # their combination breaks too often
     # (example breakage: https://gitlab.com/pycqa/flake8/issues/427)
-    'aiohttp>=3.8.1; python_version < "3.12"',
-    'aiohttp==3.9.0b0; python_version >= "3.12"',
+    'aiohttp>=3.10.5',
     'flake8~=5.0',
     'psutil',
     'pycodestyle~=2.9.0',
     'pyOpenSSL~=23.0.0',
     'mypy>=0.800',
-    'Cython(>=0.29.36,<0.30.0)',
+]
+dev = [
+    'setuptools>=60',
+    'Cython~=3.0',
 ]
 docs = [
     'Sphinx~=4.1.2',
@@ -55,7 +58,7 @@ docs = [
 requires = [
     "setuptools>=60",
     "wheel",
-    "Cython(>=0.29.36,<0.30.0)",
+    "Cython~=3.0",
 ]
 build-backend = "setuptools.build_meta"
 

setup.py

@@ -21,7 +21,7 @@
 from setuptools.command.sdist import sdist
 
 
-CYTHON_DEPENDENCY = 'Cython(>=0.29.36,<0.30.0)'
+CYTHON_DEPENDENCY = 'Cython~=3.0'
 MACHINE = platform.machine()
 MODULES_CFLAGS = [os.getenv('UVLOOP_OPT_CFLAGS', '-O2')]
 _ROOT = pathlib.Path(__file__).parent
@@ -140,11 +140,14 @@ def finalize_options(self):
                         v = True
 
                     directives[k] = v
+                self.cython_directives = directives
 
             self.distribution.ext_modules[:] = cythonize(
                 self.distribution.ext_modules,
                 compiler_directives=directives,
-                annotate=self.cython_annotate)
+                annotate=self.cython_annotate,
+                compile_time_env=dict(DEFAULT_FREELIST_SIZE=250),
+                emit_linenums=self.debug)
 
         super().finalize_options()
 
@@ -176,7 +179,11 @@ def build_libuv(self):
             cmd,
             cwd=LIBUV_BUILD_DIR, env=env, check=True)
 
-        j_flag = '-j{}'.format(os.cpu_count() or 1)
+        try:
+            njobs = len(os.sched_getaffinity(0))
+        except AttributeError:
+            njobs = os.cpu_count()
+        j_flag = '-j{}'.format(njobs or 1)
         c_flag = "CFLAGS={}".format(env['CFLAGS'])
         subprocess.run(
             ['make', j_flag, c_flag],

tests/test_base.py

@@ -576,9 +576,14 @@ def get_name(self):
         async def coro():
             pass
 
-        factory = lambda loop, coro, **kwargs: MyTask(
-            coro, loop=loop, **kwargs
-        )
+        def factory(loop, coro, **kwargs):
+            task = MyTask(coro, loop=loop, **kwargs)
+            # Python moved the responsibility to set the name to the Task
+            # class constructor, so MyTask.set_name is never called by
+            # Python's create_task.  Compensate for that here.
+            if self.is_asyncio_loop() and "name" in kwargs:
+                task.set_name(kwargs["name"])
+            return task
 
         self.assertIsNone(self.loop.get_task_factory())
         task = self.loop.create_task(coro(), name="mytask")

tests/test_dns.py

@@ -10,9 +10,11 @@ def patched_getaddrinfo(*args, **kwargs):
     # flag AI_CANONNAME, even if `host` is an IP
     rv = []
     result = socket.getaddrinfo(*args, **kwargs)
+    first = True
     for af, sk, proto, canon_name, addr in result:
         if kwargs.get('flags', 0) & socket.AI_CANONNAME:
-            if not canon_name:
+            if not canon_name and first:
+                first = False
                 canon_name = args[0]
                 if not isinstance(canon_name, str):
                     canon_name = canon_name.decode('ascii')
@@ -24,20 +26,20 @@ def patched_getaddrinfo(*args, **kwargs):
 
 class BaseTestDNS:
 
-    def _test_getaddrinfo(self, *args, _patch=False, **kwargs):
+    def _test_getaddrinfo(self, *args, _patch=False, _sorted=False, **kwargs):
         err = None
         try:
             if _patch:
                 a1 = patched_getaddrinfo(*args, **kwargs)
             else:
                 a1 = socket.getaddrinfo(*args, **kwargs)
-        except socket.gaierror as ex:
+        except (socket.gaierror, UnicodeError) as ex:
             err = ex
 
         try:
             a2 = self.loop.run_until_complete(
                 self.loop.getaddrinfo(*args, **kwargs))
-        except socket.gaierror as ex:
+        except (socket.gaierror, UnicodeError) as ex:
             if err is not None:
                 self.assertEqual(ex.args, err.args)
             else:
@@ -50,7 +52,17 @@ def _test_getaddrinfo(self, *args, _patch=False, **kwargs):
             if err is not None:
                 raise err
 
-            self.assertEqual(a1, a2)
+            if _sorted:
+                if kwargs.get('flags', 0) & socket.AI_CANONNAME and a1 and a2:
+                    af, sk, proto, canon_name1, addr = a1[0]
+                    a1[0] = (af, sk, proto, '', addr)
+                    af, sk, proto, canon_name2, addr = a2[0]
+                    a2[0] = (af, sk, proto, '', addr)
+                    self.assertEqual(canon_name1, canon_name2)
+
+                self.assertEqual(sorted(a1), sorted(a2))
+            else:
+                self.assertEqual(a1, a2)
 
     def _test_getnameinfo(self, *args, **kwargs):
         err = None
@@ -77,11 +89,13 @@ def _test_getnameinfo(self, *args, **kwargs):
             self.assertEqual(a1, a2)
 
     def test_getaddrinfo_1(self):
-        self._test_getaddrinfo('example.com', 80)
-        self._test_getaddrinfo('example.com', 80, type=socket.SOCK_STREAM)
+        self._test_getaddrinfo('example.com', 80, _sorted=True)
+        self._test_getaddrinfo('example.com', 80, type=socket.SOCK_STREAM,
+                               _sorted=True)
 
     def test_getaddrinfo_2(self):
-        self._test_getaddrinfo('example.com', 80, flags=socket.AI_CANONNAME)
+        self._test_getaddrinfo('example.com', 80, flags=socket.AI_CANONNAME,
+                               _sorted=True)
 
     def test_getaddrinfo_3(self):
         self._test_getaddrinfo('a' + '1' * 50 + '.wat', 800)
@@ -92,12 +106,14 @@ def test_getaddrinfo_4(self):
                                family=-1)
 
     def test_getaddrinfo_5(self):
-        self._test_getaddrinfo('example.com', '80')
-        self._test_getaddrinfo('example.com', '80', type=socket.SOCK_STREAM)
+        self._test_getaddrinfo('example.com', '80', _sorted=True)
+        self._test_getaddrinfo('example.com', '80', type=socket.SOCK_STREAM,
+                               _sorted=True)
 
     def test_getaddrinfo_6(self):
-        self._test_getaddrinfo(b'example.com', b'80')
-        self._test_getaddrinfo(b'example.com', b'80', type=socket.SOCK_STREAM)
+        self._test_getaddrinfo(b'example.com', b'80', _sorted=True)
+        self._test_getaddrinfo(b'example.com', b'80', type=socket.SOCK_STREAM,
+                               _sorted=True)
 
     def test_getaddrinfo_7(self):
         self._test_getaddrinfo(None, 0)
@@ -116,8 +132,9 @@ def test_getaddrinfo_10(self):
         self._test_getaddrinfo(None, None, type=socket.SOCK_STREAM)
 
     def test_getaddrinfo_11(self):
-        self._test_getaddrinfo(b'example.com', '80')
-        self._test_getaddrinfo(b'example.com', '80', type=socket.SOCK_STREAM)
+        self._test_getaddrinfo(b'example.com', '80', _sorted=True)
+        self._test_getaddrinfo(b'example.com', '80', type=socket.SOCK_STREAM,
+                               _sorted=True)
 
     def test_getaddrinfo_12(self):
         # musl always returns ai_canonname but we don't
@@ -187,6 +204,18 @@ def test_getaddrinfo_20(self):
         self._test_getaddrinfo('127.0.0.1', 80, type=socket.SOCK_STREAM,
                                flags=socket.AI_CANONNAME, _patch=patch)
 
+    # https://github.com/libuv/libuv/security/advisories/GHSA-f74f-cvh7-c6q6
+    # See also: https://github.com/MagicStack/uvloop/pull/600
+    def test_getaddrinfo_21(self):
+        payload = f'0x{"0" * 246}7f000001.example.com'.encode('ascii')
+        self._test_getaddrinfo(payload, 80)
+        self._test_getaddrinfo(payload, 80, type=socket.SOCK_STREAM)
+
+    def test_getaddrinfo_22(self):
+        payload = f'0x{"0" * 246}7f000001.example.com'
+        self._test_getaddrinfo(payload, 80)
+        self._test_getaddrinfo(payload, 80, type=socket.SOCK_STREAM)
+
     ######
 
     def test_getnameinfo_1(self):

tests/test_tcp.py

@@ -248,8 +248,9 @@ def test_create_server_4(self):
             addr = sock.getsockname()
 
             with self.assertRaisesRegex(OSError,
-                                        r"error while attempting.*\('127.*: "
-                                        r"address( already)? in use"):
+                                        r"error while attempting.*\('127.*:"
+                                        r"( \[errno \d+\])? address"
+                                        r"( already)? in use"):
 
                 self.loop.run_until_complete(
                     self.loop.create_server(object, *addr))
@@ -1630,17 +1631,22 @@ async def client(addr):
             self.fail("unexpected call to connection_made()")
 
     def test_ssl_connect_accepted_socket(self):
-        if hasattr(ssl, 'PROTOCOL_TLS'):
-            proto = ssl.PROTOCOL_TLS
+        if hasattr(ssl, 'PROTOCOL_TLS_SERVER'):
+            server_proto = ssl.PROTOCOL_TLS_SERVER
+            client_proto = ssl.PROTOCOL_TLS_CLIENT
         else:
-            proto = ssl.PROTOCOL_SSLv23
-        server_context = ssl.SSLContext(proto)
+            if hasattr(ssl, 'PROTOCOL_TLS'):
+                client_proto = server_proto = ssl.PROTOCOL_TLS
+            else:
+                client_proto = server_proto = ssl.PROTOCOL_SSLv23
+
+        server_context = ssl.SSLContext(server_proto)
         server_context.load_cert_chain(self.ONLYCERT, self.ONLYKEY)
         if hasattr(server_context, 'check_hostname'):
             server_context.check_hostname = False
         server_context.verify_mode = ssl.CERT_NONE
 
-        client_context = ssl.SSLContext(proto)
+        client_context = ssl.SSLContext(client_proto)
         if hasattr(server_context, 'check_hostname'):
             client_context.check_hostname = False
         client_context.verify_mode = ssl.CERT_NONE
@@ -2233,8 +2239,7 @@ def test_renegotiation(self):
         sslctx.use_privatekey_file(self.ONLYKEY)
         sslctx.use_certificate_chain_file(self.ONLYCERT)
         client_sslctx = self._create_client_ssl_context()
-        if hasattr(ssl, 'OP_NO_TLSv1_3'):
-            client_sslctx.options |= ssl.OP_NO_TLSv1_3
+        client_sslctx.maximum_version = ssl.TLSVersion.TLSv1_2
 
         def server(sock):
             conn = openssl_ssl.Connection(sslctx, sock)
@@ -2592,8 +2597,7 @@ def test_flush_before_shutdown(self):
         sslctx_openssl.use_privatekey_file(self.ONLYKEY)
         sslctx_openssl.use_certificate_chain_file(self.ONLYCERT)
         client_sslctx = self._create_client_ssl_context()
-        if hasattr(ssl, 'OP_NO_TLSv1_3'):
-            client_sslctx.options |= ssl.OP_NO_TLSv1_3
+        client_sslctx.maximum_version = ssl.TLSVersion.TLSv1_2
 
         future = None