swarmauri_certs_self_signed 0.3.0.dev5__tar.gz → 0.11.0.dev2__tar.gz

{swarmauri_certs_self_signed-0.3.0.dev5 → swarmauri_certs_self_signed-0.11.0.dev2}/PKG-INFO

@@ -1,25 +1,26 @@
 Metadata-Version: 2.4
 Name: swarmauri_certs_self_signed
-Version: 0.3.0.dev5
+Version: 0.11.0.dev2
 Summary: Self-signed certificate builder for Swarmauri
 License-Expression: Apache-2.0
 License-File: LICENSE
 Keywords: swarmauri,sdk,standards,certs,self,signed,certificates,self-signed-certificates,certificate-builder,development-certificates,x509-format
 Author: Jacob Stewart
 Author-email: jacob@swarmauri.com
-Requires-Python: >=3.10,<3.13
+Requires-Python: >=3.10,<3.15
 Classifier: License :: OSI Approved :: Apache Software License
 Classifier: Natural Language :: English
-Classifier: Programming Language :: Python :: 3.10
-Classifier: Programming Language :: Python :: 3.11
-Classifier: Programming Language :: Python :: 3.12
-Classifier: Programming Language :: Python :: 3.13
 Classifier: Development Status :: 3 - Alpha
 Classifier: Topic :: Security :: Cryptography
 Classifier: Intended Audience :: Developers
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3 :: Only
+Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
 Provides-Extra: ocsp
 Requires-Dist: cryptography
 Requires-Dist: pyopenssl ; extra == "ocsp"
@@ -27,23 +28,21 @@ Requires-Dist: swarmauri_base
 Requires-Dist: swarmauri_core
 Description-Content-Type: text/markdown
 
-![Swarmauri Logo](https://github.com/swarmauri/swarmauri-sdk/blob/3d4d1cfa949399d7019ae9d8f296afba773dfb7f/assets/swarmauri.brand.theme.svg)
-
+![Swarmauri Logo](https://raw.githubusercontent.com/swarmauri/swarmauri-sdk/master/assets/swarmauri_sdk_brand.png)
 
 <p align="center">
-    <a href="https://pypi.org/project/swarmauri_certs_self_signed/">
-        <img src="https://img.shields.io/pypi/dm/swarmauri_certs_self_signed" alt="PyPI - Downloads"/></a>
+    <a href="https://pepy.tech/project/swarmauri_certs_self_signed/">
+        <img src="https://static.pepy.tech/badge/swarmauri_certs_self_signed/month" alt="PyPI - Downloads"/></a>
     <a href="https://hits.sh/github.com/swarmauri/swarmauri-sdk/tree/master/pkgs/standards/swarmauri_certs_self_signed/">
         <img alt="Hits" src="https://hits.sh/github.com/swarmauri/swarmauri-sdk/tree/master/pkgs/standards/swarmauri_certs_self_signed.svg"/></a>
     <a href="https://pypi.org/project/swarmauri_certs_self_signed/">
-        <img src="https://img.shields.io/pypi/pyversions/swarmauri_certs_self_signed" alt="PyPI - Python Version"/></a>
+        <img src="https://img.shields.io/badge/python-3.10%20%7C%203.11%20%7C%203.12%20%7C%203.13%20%7C%203.14-blue" alt="PyPI - Python Version"/></a>
     <a href="https://pypi.org/project/swarmauri_certs_self_signed/">
         <img src="https://img.shields.io/pypi/l/swarmauri_certs_self_signed" alt="PyPI - License"/></a>
     <a href="https://pypi.org/project/swarmauri_certs_self_signed/">
         <img src="https://img.shields.io/pypi/v/swarmauri_certs_self_signed?label=swarmauri_certs_self_signed&color=green" alt="PyPI - swarmauri_certs_self_signed"/></a>
-</p>
-
----
+    <a href="https://discord.gg/N4UpBuQv8T">
+        <img src="https://img.shields.io/badge/Discord-Join%20Chat-5865F2?logo=discord&logoColor=white" alt="Discord"/></a></p>
 
 # Swarmauri Self-Signed Certificate Builder
 
@@ -123,3 +122,5 @@ This package registers `SelfSignedCertificate` under both the `swarmauri.cert_se
 If you want to contribute to swarmauri-sdk, read up on our
 [guidelines for contributing](https://github.com/swarmauri/swarmauri-sdk/blob/master/CONTRIBUTING.md)
 that will help you get started.
+
+

{swarmauri_certs_self_signed-0.3.0.dev5 → swarmauri_certs_self_signed-0.11.0.dev2}/README.md

@@ -1,20 +1,18 @@
-![Swarmauri Logo](https://github.com/swarmauri/swarmauri-sdk/blob/3d4d1cfa949399d7019ae9d8f296afba773dfb7f/assets/swarmauri.brand.theme.svg)
-
+![Swarmauri Logo](https://raw.githubusercontent.com/swarmauri/swarmauri-sdk/master/assets/swarmauri_sdk_brand.png)
 
 <p align="center">
-    <a href="https://pypi.org/project/swarmauri_certs_self_signed/">
-        <img src="https://img.shields.io/pypi/dm/swarmauri_certs_self_signed" alt="PyPI - Downloads"/></a>
+    <a href="https://pepy.tech/project/swarmauri_certs_self_signed/">
+        <img src="https://static.pepy.tech/badge/swarmauri_certs_self_signed/month" alt="PyPI - Downloads"/></a>
     <a href="https://hits.sh/github.com/swarmauri/swarmauri-sdk/tree/master/pkgs/standards/swarmauri_certs_self_signed/">
         <img alt="Hits" src="https://hits.sh/github.com/swarmauri/swarmauri-sdk/tree/master/pkgs/standards/swarmauri_certs_self_signed.svg"/></a>
     <a href="https://pypi.org/project/swarmauri_certs_self_signed/">
-        <img src="https://img.shields.io/pypi/pyversions/swarmauri_certs_self_signed" alt="PyPI - Python Version"/></a>
+        <img src="https://img.shields.io/badge/python-3.10%20%7C%203.11%20%7C%203.12%20%7C%203.13%20%7C%203.14-blue" alt="PyPI - Python Version"/></a>
     <a href="https://pypi.org/project/swarmauri_certs_self_signed/">
         <img src="https://img.shields.io/pypi/l/swarmauri_certs_self_signed" alt="PyPI - License"/></a>
     <a href="https://pypi.org/project/swarmauri_certs_self_signed/">
         <img src="https://img.shields.io/pypi/v/swarmauri_certs_self_signed?label=swarmauri_certs_self_signed&color=green" alt="PyPI - swarmauri_certs_self_signed"/></a>
-</p>
-
----
+    <a href="https://discord.gg/N4UpBuQv8T">
+        <img src="https://img.shields.io/badge/Discord-Join%20Chat-5865F2?logo=discord&logoColor=white" alt="Discord"/></a></p>
 
 # Swarmauri Self-Signed Certificate Builder
 
@@ -93,4 +91,5 @@ This package registers `SelfSignedCertificate` under both the `swarmauri.cert_se
 
 If you want to contribute to swarmauri-sdk, read up on our
 [guidelines for contributing](https://github.com/swarmauri/swarmauri-sdk/blob/master/CONTRIBUTING.md)
-that will help you get started.
+that will help you get started.
+

{swarmauri_certs_self_signed-0.3.0.dev5 → swarmauri_certs_self_signed-0.11.0.dev2}/pyproject.toml

@@ -1,24 +1,25 @@
 [project]
 name = "swarmauri_certs_self_signed"
-version = "0.3.0.dev5"
+version = "0.11.0.dev2"
 description = "Self-signed certificate builder for Swarmauri"
 license = "Apache-2.0"
 readme = "README.md"
-requires-python = ">=3.10,<3.13"
+requires-python = ">=3.10,<3.15"
 authors = [{ name = "Jacob Stewart", email = "jacob@swarmauri.com" }]
 classifiers = [
     "License :: OSI Approved :: Apache Software License",
     "Natural Language :: English",
-    "Programming Language :: Python :: 3.10",
-    "Programming Language :: Python :: 3.11",
-    "Programming Language :: Python :: 3.12",
-    "Programming Language :: Python :: 3.13",
     "Development Status :: 3 - Alpha",
     "Topic :: Security :: Cryptography",
     "Intended Audience :: Developers",
     "Programming Language :: Python",
     "Programming Language :: Python :: 3",
     "Programming Language :: Python :: 3 :: Only",
+    "Programming Language :: Python :: 3.10",
+    "Programming Language :: Python :: 3.11",
+    "Programming Language :: Python :: 3.12",
+    "Programming Language :: Python :: 3.13",
+    "Programming Language :: Python :: 3.14",
 ]
 dependencies = [
     "swarmauri_core",

{swarmauri_certs_self_signed-0.3.0.dev5 → swarmauri_certs_self_signed-0.11.0.dev2}/swarmauri_certs_self_signed/SelfSignedCertificate.py

@@ -1,5 +1,6 @@
 from __future__ import annotations
 
+import ipaddress
 from datetime import datetime, timedelta, timezone
 from typing import Any, Dict, Iterable, Mapping, Optional, Sequence
 
@@ -39,15 +40,21 @@ def _name_from_subject(spec: SubjectSpec) -> x509.Name:
     if "C" in spec and spec["C"]:
         rdns.append(x509.NameAttribute(NameOID.COUNTRY_NAME, spec["C"]))
     if "ST" in spec and spec["ST"]:
-        rdns.append(x509.NameAttribute(NameOID.STATE_OR_PROVINCE_NAME, spec["ST"]))
+        rdns.append(
+            x509.NameAttribute(NameOID.STATE_OR_PROVINCE_NAME, spec["ST"])
+        )
     if "L" in spec and spec["L"]:
         rdns.append(x509.NameAttribute(NameOID.LOCALITY_NAME, spec["L"]))
     if "O" in spec and spec["O"]:
         rdns.append(x509.NameAttribute(NameOID.ORGANIZATION_NAME, spec["O"]))
     if "OU" in spec and spec["OU"]:
-        rdns.append(x509.NameAttribute(NameOID.ORGANIZATIONAL_UNIT_NAME, spec["OU"]))
+        rdns.append(
+            x509.NameAttribute(NameOID.ORGANIZATIONAL_UNIT_NAME, spec["OU"])
+        )
     if "emailAddress" in spec and spec["emailAddress"]:
-        rdns.append(x509.NameAttribute(NameOID.EMAIL_ADDRESS, spec["emailAddress"]))
+        rdns.append(
+            x509.NameAttribute(NameOID.EMAIL_ADDRESS, spec["emailAddress"])
+        )
     if "CN" in spec and spec["CN"]:
         rdns.append(x509.NameAttribute(NameOID.COMMON_NAME, spec["CN"]))
 
@@ -57,21 +64,25 @@ def _name_from_subject(spec: SubjectSpec) -> x509.Name:
             continue
         rdns.append(
             x509.NameAttribute(
-                x509.ObjectIdentifier(k) if k.count(".") >= 2 else NameOID.COMMON_NAME,
+                x509.ObjectIdentifier(k)
+                if k.count(".") >= 2
+                else NameOID.COMMON_NAME,
                 v,
             )
         )
     return x509.Name(rdns)
 
 
-def _san_from_spec(san: Optional[AltNameSpec]) -> Optional[x509.SubjectAlternativeName]:
+def _san_from_spec(
+    san: Optional[AltNameSpec],
+) -> Optional[x509.SubjectAlternativeName]:
     if not san:
         return None
     gns = []
     for d in san.get("dns") or []:
         gns.append(x509.DNSName(d))
     for ip in san.get("ip") or []:
-        gns.append(x509.IPAddress(x509.ipaddress.ip_address(ip)))  # type: ignore[attr-defined]
+        gns.append(x509.IPAddress(ipaddress.ip_address(ip)))
     for uri in san.get("uri") or []:
         gns.append(x509.UniformResourceIdentifier(uri))
     for email in san.get("email") or []:
@@ -120,7 +131,9 @@ def _bc_from_spec(
 
 
 def _choose_sig_hash(private_key) -> Optional[hashes.HashAlgorithm]:
-    if isinstance(private_key, (ed25519.Ed25519PrivateKey, ed448.Ed448PrivateKey)):
+    if isinstance(
+        private_key, (ed25519.Ed25519PrivateKey, ed448.Ed448PrivateKey)
+    ):
         return None
     return hashes.SHA256()
 
@@ -129,7 +142,9 @@ def _choose_sig_hash(private_key) -> Optional[hashes.HashAlgorithm]:
 class SelfSignedCertificate(CertServiceBase):
     """Minimal self-signed certificate builder exposed as a cert service."""
 
-    subject: SubjectSpec = Field(default_factory=lambda: SubjectSpec(CN="localhost"))
+    subject: SubjectSpec = Field(
+        default_factory=lambda: SubjectSpec(CN="localhost")
+    )
     san: Optional[AltNameSpec] = None
     extensions: Optional[CertExtensionSpec] = None
     not_before: Optional[int] = None
@@ -163,7 +178,10 @@ class SelfSignedCertificate(CertServiceBase):
     ) -> bytes:
         if key.material is None:
             raise ValueError(
-                "Self-signed issuance requires a private key in KeyRef.material (PEM)."
+                (
+                    "Self-signed issuance requires a private key in "
+                    "KeyRef.material (PEM)."
+                )
             )
 
         pwd = password if password is not None else self.password
@@ -178,7 +196,9 @@ class SelfSignedCertificate(CertServiceBase):
                 else key.tags["passphrase"]
             )
 
-        private_key = serialization.load_pem_private_key(key.material, password=pwd)
+        private_key = serialization.load_pem_private_key(
+            key.material, password=pwd
+        )
         public_key = private_key.public_key()
 
         subject_spec = subject or self.subject
@@ -196,11 +216,17 @@ class SelfSignedCertificate(CertServiceBase):
         if na_epoch is not None:
             na = datetime.fromtimestamp(int(na_epoch), tz=timezone.utc)
         else:
-            life = lifetime_days if lifetime_days is not None else self.lifetime_days
+            life = (
+                lifetime_days
+                if lifetime_days is not None
+                else self.lifetime_days
+            )
             na = nb + timedelta(days=int(life))
 
         serial_number = (
-            serial if serial is not None else self.serial or x509.random_serial_number()
+            serial
+            if serial is not None
+            else self.serial or x509.random_serial_number()
         )
 
         builder = (
@@ -215,7 +241,11 @@ class SelfSignedCertificate(CertServiceBase):
 
         ext_spec = extensions if extensions is not None else self.extensions
 
-        bc = _bc_from_spec(ext_spec.get("basic_constraints")) if ext_spec else None
+        bc = (
+            _bc_from_spec(ext_spec.get("basic_constraints"))
+            if ext_spec
+            else None
+        )
         if bc:
             builder = builder.add_extension(bc, critical=True)
 
@@ -223,7 +253,11 @@ class SelfSignedCertificate(CertServiceBase):
         if ku:
             builder = builder.add_extension(ku, critical=True)
 
-        eku = _eku_from_spec(ext_spec.get("extended_key_usage")) if ext_spec else None
+        eku = (
+            _eku_from_spec(ext_spec.get("extended_key_usage"))
+            if ext_spec
+            else None
+        )
         if eku:
             builder = builder.add_extension(eku, critical=False)
 
@@ -243,16 +277,20 @@ class SelfSignedCertificate(CertServiceBase):
 
         if ext_spec and ext_spec.get("name_constraints"):
             nc = ext_spec["name_constraints"]
-            permitted_dns = [x509.DNSName(d) for d in (nc.get("permitted_dns") or [])]
-            excluded_dns = [x509.DNSName(d) for d in (nc.get("excluded_dns") or [])]
+            permitted_dns = [
+                x509.DNSName(d) for d in (nc.get("permitted_dns") or [])
+            ]
+            excluded_dns = [
+                x509.DNSName(d) for d in (nc.get("excluded_dns") or [])
+            ]
             permitted_ip = [
-                x509.IPAddress(x509.ipaddress.ip_address(ip))
+                x509.IPAddress(ipaddress.ip_network(ip))
                 for ip in (nc.get("permitted_ip") or [])
-            ]  # type: ignore[attr-defined]
+            ]
             excluded_ip = [
-                x509.IPAddress(x509.ipaddress.ip_address(ip))
+                x509.IPAddress(ipaddress.ip_network(ip))
                 for ip in (nc.get("excluded_ip") or [])
-            ]  # type: ignore[attr-defined]
+            ]
             permitted_uri = [
                 x509.UniformResourceIdentifier(u)
                 for u in (nc.get("permitted_uri") or [])
@@ -271,11 +309,17 @@ class SelfSignedCertificate(CertServiceBase):
             builder = builder.add_extension(
                 x509.NameConstraints(
                     permitted_subtrees=(
-                        permitted_dns + permitted_ip + permitted_uri + permitted_email
+                        permitted_dns
+                        + permitted_ip
+                        + permitted_uri
+                        + permitted_email
                     )
                     or None,
                     excluded_subtrees=(
-                        excluded_dns + excluded_ip + excluded_uri + excluded_email
+                        excluded_dns
+                        + excluded_ip
+                        + excluded_uri
+                        + excluded_email
                     )
                     or None,
                 ),
@@ -350,7 +394,10 @@ class SelfSignedCertificate(CertServiceBase):
             subject_alt_name=san,
         )
         return cls(
-            subject=subject, san=san, extensions=ext, lifetime_days=lifetime_days
+            subject=subject,
+            san=san,
+            extensions=ext,
+            lifetime_days=lifetime_days,
         )
 
     @classmethod
@@ -379,5 +426,8 @@ class SelfSignedCertificate(CertServiceBase):
             subject_alt_name=san,
         )
         return cls(
-            subject=subject, san=san, extensions=ext, lifetime_days=lifetime_days
+            subject=subject,
+            san=san,
+            extensions=ext,
+            lifetime_days=lifetime_days,
         )