mrok 0.2.0__tar.gz → 0.2.1__tar.gz

{mrok-0.2.0 → mrok-0.2.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mrok
-Version: 0.2.0
+Version: 0.2.1
 Summary: MPT Extensions OpenZiti Orchestrator
 Author: SoftwareOne AG
 License:                                  Apache License
@@ -206,6 +206,7 @@ License:                                  Apache License
            limitations under the License.
 License-File: LICENSE.txt
 Requires-Python: <4,>=3.12
+Requires-Dist: asn1crypto<2.0.0,>=1.5.1
 Requires-Dist: cryptography<46.0.0,>=45.0.7
 Requires-Dist: dynaconf<4.0.0,>=3.2.11
 Requires-Dist: fastapi-pagination<0.15.0,>=0.14.1

{mrok-0.2.0 → mrok-0.2.1}/mrok/ziti/pki.py

@@ -1,9 +1,9 @@
 import base64
 
+from asn1crypto import cms
 from cryptography import x509
 from cryptography.hazmat.primitives import hashes, serialization
 from cryptography.hazmat.primitives.asymmetric import rsa
-from cryptography.hazmat.primitives.serialization.pkcs7 import load_der_pkcs7_certificates
 from cryptography.x509.oid import NameOID
 
 from mrok.ziti.api import ZitiManagementAPI
@@ -16,11 +16,16 @@ async def get_ca_certificates(mgmt_api: ZitiManagementAPI) -> str:
     if not _ca_certificates:
         cas_pkcs7 = await mgmt_api.fetch_ca_certificates()
         pkcs7_bytes = base64.b64decode(cas_pkcs7)
-        pkcs7_certs = load_der_pkcs7_certificates(pkcs7_bytes)
+
+        content_info = cms.ContentInfo.load(pkcs7_bytes)
+        certs = content_info["content"]["certificates"]
+
         ca_certificates = []
-        for cert in pkcs7_certs:
-            cert_pem = cert.public_bytes(serialization.Encoding.PEM)
-            ca_certificates.append(cert_pem.decode("utf-8"))
+        for cert in certs:
+            crypt_cert = x509.load_der_x509_certificate(cert.dump())
+            pem = crypt_cert.public_bytes(serialization.Encoding.PEM).decode("utf-8")
+            ca_certificates.append(pem)
+
         _ca_certificates = "\n".join(ca_certificates)
     return _ca_certificates
 

{mrok-0.2.0 → mrok-0.2.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "mrok"
-version = "0.2.0"
+version = "0.2.1"
 description = "MPT Extensions OpenZiti Orchestrator"
 readme = { file = "README.md", content-type = "text/markdown" }
 authors = [
@@ -9,6 +9,7 @@ authors = [
 license = { file = "LICENSE.txt" }
 requires-python = ">=3.12,<4"
 dependencies = [
+    "asn1crypto>=1.5.1,<2.0.0",
     "cryptography>=45.0.7,<46.0.0",
     "dynaconf>=3.2.11,<4.0.0",
     "fastapi-pagination>=0.14.1,<0.15.0",

{mrok-0.2.0 → mrok-0.2.1}/uv.lock

@@ -37,6 +37,15 @@ wheels = [
     { url = "https://files.pythonhosted.org/packages/2f/f5/c36551e93acba41a59939ae6a0fb77ddb3f2e8e8caa716410c65f7341f72/asgi_lifespan-2.1.0-py3-none-any.whl", hash = "sha256:ed840706680e28428c01e14afb3875d7d76d3206f3d5b2f2294e059b5c23804f", size = 10895, upload-time = "2023-03-28T17:35:47.772Z" },
 ]
 
+[[package]]
+name = "asn1crypto"
+version = "1.5.1"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/de/cf/d547feed25b5244fcb9392e288ff9fdc3280b10260362fc45d37a798a6ee/asn1crypto-1.5.1.tar.gz", hash = "sha256:13ae38502be632115abf8a24cbe5f4da52e3b5231990aff31123c805306ccb9c", size = 121080, upload-time = "2022-03-15T14:46:52.889Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/c9/7f/09065fd9e27da0eda08b4d6897f1c13535066174cc023af248fc2a8d5e5a/asn1crypto-1.5.1-py2.py3-none-any.whl", hash = "sha256:db4e40728b728508912cbb3d44f19ce188f218e9eba635821bb4b68564f8fd67", size = 105045, upload-time = "2022-03-15T14:46:51.055Z" },
+]
+
 [[package]]
 name = "asttokens"
 version = "3.0.0"
@@ -672,6 +681,7 @@ name = "mrok"
 version = "0.0.0.dev0"
 source = { editable = "." }
 dependencies = [
+    { name = "asn1crypto" },
     { name = "cryptography" },
     { name = "dynaconf" },
     { name = "fastapi", extra = ["standard"] },
@@ -708,6 +718,7 @@ dev = [
 
 [package.metadata]
 requires-dist = [
+    { name = "asn1crypto", specifier = ">=1.5.1,<2.0.0" },
     { name = "cryptography", specifier = ">=45.0.7,<46.0.0" },
     { name = "dynaconf", specifier = ">=3.2.11,<4.0.0" },
     { name = "fastapi", extras = ["standard"], specifier = ">=0.119.0,<0.120.0" },