fix a bug with parameter name

closes #7

Author: egorsmkv

Cargo.lock

@@ -27,6 +27,7 @@ pprof = { version = "0.15.0", default-features = false, features = ["flamegraph"
 pyo3 = { version = "0.28", features = ["extension-module"] }
 pyo3-async-runtimes = { version = "0.28", features = ["async-std-runtime"] }
 rustls = "0.23"
+rustls-native-certs = "0.8"
 rustls-pemfile = "2"
 signal-hook = "0.4"
 socket2 = "0.6"

Cargo.toml

@@ -104,7 +104,17 @@ def __install_ssl_tracking() -> None:
     if getattr(context_cls, "_rsloop_tracking_installed", False):
         return
 
+    def mark_default_verify_paths(context):
+        context.__dict__["_rsloop_use_default_verify_paths"] = True
+        return context
+
+    orig_create_default_context = __ssl.create_default_context
     orig_load_cert_chain = context_cls.load_cert_chain
+    orig_load_default_certs = context_cls.load_default_certs
+    orig_set_default_verify_paths = context_cls.set_default_verify_paths
+
+    def create_default_context(*args, **kwargs):
+        return mark_default_verify_paths(orig_create_default_context(*args, **kwargs))
 
     def load_cert_chain(self, certfile, keyfile=None, password=None):
         result = orig_load_cert_chain(
@@ -128,7 +138,20 @@ def load_cert_chain(self, certfile, keyfile=None, password=None):
         self.__dict__["_rsloop_key_password"] = password_value
         return result
 
+    def load_default_certs(self, *args, **kwargs):
+        result = orig_load_default_certs(self, *args, **kwargs)
+        mark_default_verify_paths(self)
+        return result
+
+    def set_default_verify_paths(self):
+        result = orig_set_default_verify_paths(self)
+        mark_default_verify_paths(self)
+        return result
+
+    __ssl.create_default_context = create_default_context
     context_cls.load_cert_chain = load_cert_chain
+    context_cls.load_default_certs = load_default_certs
+    context_cls.set_default_verify_paths = set_default_verify_paths
     context_cls._rsloop_tracking_installed = True
 
 

python/rsloop/__init__.py

@@ -1994,7 +1994,7 @@ impl PyLoop {
         })
     }
 
-    #[pyo3(signature=(host, port, *, family=0, sock_type=0, proto=0, flags=0))]
+    #[pyo3(signature=(host, port, *, family=0, r#type=0, proto=0, flags=0))]
     #[expect(
         clippy::too_many_arguments,
         reason = "Mirrors asyncio loop.getaddrinfo()"
@@ -2005,7 +2005,7 @@ impl PyLoop {
         host: Option<Py<PyAny>>,
         port: Option<Py<PyAny>>,
         family: i32,
-        sock_type: i32,
+        r#type: i32,
         proto: i32,
         flags: i32,
     ) -> PyResult<Bound<'_, PyAny>> {
@@ -2016,7 +2016,7 @@ impl PyLoop {
                     let socket = py.import("socket")?;
                     let kwargs = PyDict::new(py);
                     kwargs.set_item("family", family)?;
-                    kwargs.set_item("type", sock_type)?;
+                    kwargs.set_item("type", r#type)?;
                     kwargs.set_item("proto", proto)?;
                     kwargs.set_item("flags", flags)?;
 

src/python_api.rs

@@ -208,6 +208,26 @@ fn root_store_from_context(py: Python<'_>, ssl_context: &Py<PyAny>) -> PyResult<
             .add(CertificateDer::from(bytes.as_bytes().to_vec()))
             .map_err(to_py_tls_err)?;
     }
+
+    let use_default_verify_paths = ssl_context
+        .bind(py)
+        .getattr("__dict__")?
+        .cast::<PyDict>()?
+        .get_item("_rsloop_use_default_verify_paths")?
+        .and_then(|value| value.extract::<bool>().ok())
+        .unwrap_or(false);
+    if use_default_verify_paths {
+        let native = rustls_native_certs::load_native_certs();
+        for error in native.errors {
+            return Err(PyRuntimeError::new_err(format!(
+                "failed to load native CA certificates: {error}"
+            )));
+        }
+        for cert in native.certs {
+            roots.add(cert).map_err(to_py_tls_err)?;
+        }
+    }
+
     Ok(roots)
 }
 

src/tls.rs

@@ -0,0 +1,13 @@
+import rsloop
+import aiohttp
+
+
+async def fetch_url(url):
+    async with aiohttp.ClientSession() as session:
+        async with session.get(url) as response:
+            return await response.text()
+
+
+if __name__ == "__main__":
+    html_content = rsloop.run(fetch_url("https://httpbin.org/get"))
+    print(html_content)

tests/packages/aiohttp_test.py

@@ -1,5 +1,6 @@
 import asyncio
 import os
+import socket
 import sys
 import unittest
 
@@ -160,6 +161,21 @@ async def main() -> dict[str, object]:
             },
         )
 
+    def test_getaddrinfo_accepts_type_keyword(self) -> None:
+        async def main() -> list[tuple[object, ...]]:
+            loop = asyncio.get_running_loop()
+            return await loop.getaddrinfo(
+                "localhost",
+                80,
+                type=socket.SOCK_STREAM,
+            )
+
+        addrinfos = rsloop.run(main())
+        self.assertTrue(addrinfos)
+        self.assertTrue(
+            all(addrinfo[1] == socket.SOCK_STREAM for addrinfo in addrinfos),
+        )
+
 
 if __name__ == "__main__":
     unittest.main()

tests/test_run.py

@@ -2,6 +2,7 @@
 import os
 import pathlib
 import socket
+import ssl
 import tempfile
 import unittest
 
@@ -42,6 +43,10 @@ def make_ssl_contexts(tmpdir: str):
 
 
 class TlsTests(unittest.TestCase):
+    def test_create_default_context_marks_default_verify_paths(self) -> None:
+        context = ssl.create_default_context()
+        self.assertTrue(context.__dict__.get("_rsloop_use_default_verify_paths"))
+
     def test_create_connection_and_server_tls_round_trip(self) -> None:
         async def main() -> str:
             loop = asyncio.get_running_loop()