aiomisc 17.6.3__tar.gz → 17.7.1__tar.gz

{aiomisc-17.6.3 → aiomisc-17.7.1}/PKG-INFO

@@ -1,11 +1,11 @@
 Metadata-Version: 2.3
 Name: aiomisc
-Version: 17.6.3
+Version: 17.7.1
 Summary: aiomisc - miscellaneous utils for asyncio
 License: MIT
 Author: Dmitry Orlov
 Author-email: me@mosquito.su
-Requires-Python: >=3.8,<4.0
+Requires-Python: >=3.9,<4.0
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Framework :: AsyncIO
 Classifier: Framework :: Pytest
@@ -23,7 +23,6 @@ Classifier: Operating System :: POSIX
 Classifier: Operating System :: POSIX :: Linux
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
@@ -66,7 +65,7 @@ Requires-Dist: rich ; extra == "rich"
 Requires-Dist: setuptools ; python_version < "3.8"
 Requires-Dist: typing_extensions ; python_version < "3.10"
 Requires-Dist: uvicorn (>=0.27,<0.28) ; extra == "uvicorn"
-Requires-Dist: uvloop (>=0.19,<1) ; extra == "uvloop"
+Requires-Dist: uvloop (>=0.21,<1) ; extra == "uvloop"
 Project-URL: Changelog, https://github.com/aiokitchen/aiomisc/blob/master/CHANGELOG.md
 Project-URL: Documentation, https://docs.aiomisc.com/
 Project-URL: Homepage, https://github.com/aiokitchen/aiomisc

{aiomisc-17.6.3 → aiomisc-17.7.1}/aiomisc/process_pool.py

@@ -39,7 +39,9 @@ class ProcessPoolExecutor(ProcessPoolExecutorBase, EventLoopMixin):
         self._statistic.sum_time += loop.time() - start_time
 
     def submit(self, *args: Any, **kwargs: Any) -> Future:
-        """Submit blocking function to the pool"""
+        """
+        Submit blocking function to the pool
+        """
         loop = asyncio.get_running_loop()
         start_time = loop.time()
         future = super().submit(*args, **kwargs)

{aiomisc-17.6.3 → aiomisc-17.7.1}/aiomisc/service/tls.py

@@ -17,6 +17,19 @@ PathOrStr = Union[Path, str]
 log = logging.getLogger(__name__)
 
 
+DEFAULT_SSL_CIPHERS = (
+    "ECDHE-RSA-AES256-GCM-SHA384",
+    "ECDHE-ECDSA-AES256-GCM-SHA384",
+    "ECDHE-RSA-CHACHA20-POLY1305",
+    "ECDHE-ECDSA-CHACHA20-POLY1305",
+    "ECDHE-RSA-AES128-GCM-SHA256",
+    "ECDHE-ECDSA-AES128-GCM-SHA256",
+)
+
+DEFAULT_SSL_MIN_VERSION = ssl.TLSVersion.TLSv1_3
+DEFAULT_SSL_MAX_VERSION = ssl.TLSVersion.TLSv1_3
+
+
 @dataclass(frozen=True)
 class SSLOptionsBase:
     cert: Optional[Path]
@@ -25,6 +38,9 @@ class SSLOptionsBase:
     verify: bool
     require_client_cert: bool
     purpose: ssl.Purpose
+    minimum_version: ssl.TLSVersion = DEFAULT_SSL_MIN_VERSION
+    maximum_version: ssl.TLSVersion = DEFAULT_SSL_MAX_VERSION
+    ciphers: Tuple[str, ...] = DEFAULT_SSL_CIPHERS
 
 
 class SSLOptions(SSLOptionsBase):
@@ -32,6 +48,9 @@ class SSLOptions(SSLOptionsBase):
         self, cert: Optional[PathOrStr], key: Optional[PathOrStr],
         ca: Optional[PathOrStr], verify: bool, require_client_cert: bool,
         purpose: ssl.Purpose,
+        minimum_version: ssl.TLSVersion = DEFAULT_SSL_MIN_VERSION,
+        maximum_version: ssl.TLSVersion = DEFAULT_SSL_MAX_VERSION,
+        ciphers: Tuple[str, ...] = DEFAULT_SSL_CIPHERS,
     ) -> None:
         super().__init__(
             cert=Path(cert) if cert else None,
@@ -40,25 +59,48 @@ class SSLOptions(SSLOptionsBase):
             verify=verify,
             require_client_cert=require_client_cert,
             purpose=purpose,
+            minimum_version=minimum_version,
+            maximum_version=maximum_version,
+            ciphers=ciphers,
         )
 
     def create_context(self) -> ssl.SSLContext:
         context = ssl.create_default_context(
-            purpose=self.purpose, cafile=self.ca,
+            purpose=self.purpose,
         )
 
-        if self.ca and not self.ca.exists():
-            raise FileNotFoundError("CA file doesn't exists")
+        # Disable compression to prevent CRIME attacks
+        context.options |= ssl.OP_NO_COMPRESSION
+
+        context.maximum_version = self.maximum_version
+        context.minimum_version = self.minimum_version
+        context.set_ciphers(":".join(self.ciphers))
+
+        if not self.verify:
+            context.check_hostname = False
+
+        if self.ca:
+            log.debug("Loading CA from %s", self.ca)
+            if not self.ca.exists():
+                raise FileNotFoundError(
+                    "CA file doesn't exists", str(self.ca.resolve()),
+                )
+            context.load_verify_locations(cafile=str(self.ca))
 
         if self.require_client_cert:
+            log.debug("Set server-side cert verification")
             context.verify_mode = ssl.VerifyMode.CERT_REQUIRED
+            # Post-handshake authentication is required
+            context.post_handshake_auth = True
+        else:
+            # Disable server-side cert verification
+            context.check_hostname = False
+            context.verify_mode = ssl.VerifyMode.CERT_NONE
 
+        # Load server-side cert and key
         if self.key and self.cert:
             context.load_cert_chain(self.cert, self.key)
 
-        if not self.verify:
-            context.check_hostname = False
-
         return context
 
 
@@ -69,13 +111,20 @@ class TLSServer(SimpleServer):
         self, *, address: Optional[str] = None, port: Optional[int] = None,
         cert: PathOrStr, key: PathOrStr, ca: Optional[PathOrStr] = None,
         require_client_cert: bool = False, verify: bool = True,
+        minimum_version: ssl.TLSVersion = DEFAULT_SSL_MIN_VERSION,
+        maximum_version: ssl.TLSVersion = DEFAULT_SSL_MAX_VERSION,
+        ciphers: Tuple[str, ...] = DEFAULT_SSL_CIPHERS,
         options: OptionsType = (), sock: Optional[socket.socket] = None,
         **kwargs: Any,
     ):
 
         self.__ssl_options = SSLOptions(
-            cert, key, ca, verify, require_client_cert,
-            ssl.Purpose.CLIENT_AUTH,
+            cert=cert, key=key, ca=ca, verify=verify,
+            require_client_cert=require_client_cert,
+            purpose=ssl.Purpose.CLIENT_AUTH,
+            minimum_version=minimum_version,
+            maximum_version=maximum_version,
+            ciphers=ciphers,
         )
 
         if not sock:

{aiomisc-17.6.3 → aiomisc-17.7.1}/aiomisc/version.py

@@ -2,5 +2,5 @@
 # BY: poem-plugins "git" plugin
 # NEVER EDIT THIS FILE MANUALLY
 
-version_info = (17, 6, 3)
-__version__ = "17.6.3"
+version_info = (17, 7, 1)
+__version__ = "17.7.1"

{aiomisc-17.6.3 → aiomisc-17.7.1}/pyproject.toml

@@ -1,7 +1,7 @@
 [tool.poetry]
 name = "aiomisc"
 # This is a dummy version which will be rewritten with poem-plugins
-version = "17.6.3"
+version = "17.7.1"
 description = "aiomisc - miscellaneous utils for asyncio"
 authors = ["Dmitry Orlov <me@mosquito.su>"]
 readme = "README.rst"
@@ -24,11 +24,11 @@ classifiers = [
     "Operating System :: POSIX :: Linux",
     "Operating System :: POSIX",
     "Programming Language :: Python :: 3",
-    "Programming Language :: Python :: 3.8",
     "Programming Language :: Python :: 3.9",
     "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",
     "Programming Language :: Python",
     "Topic :: Internet :: WWW/HTTP",
@@ -55,7 +55,7 @@ packages = [
 "Documentation" = "https://docs.aiomisc.com/"
 
 [tool.poetry.dependencies]
-python = "^3.8"
+python = "^3.9"
 aiocarbon = { version = "^0.15", optional = true }
 aiohttp = { version = ">3", optional = true }
 aiohttp-asgi = { version = "^0.5.2", optional = true }
@@ -69,14 +69,14 @@ raven = { version = "*", optional = true }
 rich = { version = "*", optional = true }
 setuptools = [{ version = '*', python = "< 3.8" }]
 typing_extensions = [{ version = '*', python = "< 3.10" }]
-uvloop = { version = ">=0.19, <1", optional = true }
+uvloop = { version = ">=0.21, <1", optional = true }
 uvicorn = { version = "^0.27", optional = true }
 asgiref = { version = "^3.7", optional = true }
 dnslib = { version = "^0.9", optional = true }
 
 [tool.poetry.group.dev.dependencies]
 aiocarbon = "^0.15.3"
-aiohttp = "^3.9"
+aiohttp = "^3.11"
 aiohttp-asgi = "~0.5.2"
 aiomisc-pytest = "^1.0.8"
 asgiref = "^3.7"
@@ -116,7 +116,7 @@ pytest-rerunfailures = "^14.0"
 sphinxcontrib-googleanalytics = "^0.4"
 
 [tool.poetry.group.uvloop.dependencies]
-uvloop = "^0.19.0"
+uvloop = "^0.21"
 
 [tool.poetry.extras]
 aiohttp = ["aiohttp"]