certapi 0.2.7__tar.gz → 0.2.9__tar.gz

{certapi-0.2.7 → certapi-0.2.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: certapi
-Version: 0.2.7
+Version: 0.2.9
 Summary: Python Package for managing keys, request SSL certificates from ACME.
 Home-page: https://github.com/mesudip/certapi
 Author: Sudip Bhattarai

{certapi-0.2.7 → certapi-0.2.9}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 setup(
     name="certapi",
-    version="0.2.7",
+    version="0.2.9",
     packages=find_packages(where="src"),
     package_dir={"": "src"},
     install_requires=[

{certapi-0.2.7 → certapi-0.2.9}/src/certapi/Acme.py

@@ -127,7 +127,7 @@ class AcmeHttpError(AcmeError, requests.HTTPError):
                             else:
                                 message = err_detail
                         else:
-                            message=error
+                            message = error
 
             if message is None:
                 if res_json.get("detail"):
@@ -345,7 +345,7 @@ class Order:
             self._data["certificate"], step="Get Certificate from Successful Order"
         )
         certificate = crypto.x509.load_pem_x509_certificates(certificate_res.content)
-        return ( certificate_res.content, certificate)
+        return (certificate_res.content, certificate)
 
     def finalize(self, csr: CertificateSigningRequest):
         """

{certapi-0.2.7 → certapi-0.2.9}/src/certapi/certauthority.py

@@ -17,7 +17,7 @@ from requests import Response
 from . import Acme, Challenge, Order
 from . import crypto
 from . import challenge
-from .crypto import cert_to_pem, key_to_pem, digest_sha256
+from .crypto import cert_to_pem, certs_to_pem, key_to_pem, digest_sha256
 from .crypto_classes import Key
 from .db import KeyStore
 from .util import b64_string
@@ -121,9 +121,9 @@ class CertAuthority:
                 order.refresh()  # is this refresh necessary?
 
                 if order.status == "valid":
-                    fullchain_cert,certificate =  order.get_certificate()
+                    fullchain_cert, certificate = order.get_certificate()
                     key_id = self.key_store.save_key(private_key, missing[0])
-                    cert_id = self.key_store.save_cert(key_id, certificate, missing)
+                    cert_id = self.key_store.save_cert(key_id, fullchain_cert, missing)
                     issued_cert = IssuedCert(key_to_pem(private_key), fullchain_cert, missing)
                     # Clean up challenges after successful certificate issuance
                     for c in challenges:
@@ -145,7 +145,9 @@ class CertAuthority:
             return createExistingResponse(existing, [])
 
 
-def createExistingResponse(existing: Dict[str, Tuple[int | str, Key, List[Certificate] | str]], issued_certs: List["IssuedCert"]):
+def createExistingResponse(
+    existing: Dict[str, Tuple[int | str, Key, List[Certificate] | str]], issued_certs: List["IssuedCert"]
+):
     certs = []
     certMap = {}
 
@@ -159,7 +161,7 @@ def createExistingResponse(existing: Dict[str, Tuple[int | str, Key, List[Certif
                 cert_pem = certs_to_pem(cert).decode("utf-8")
             else:
                 cert_pem = cert_to_pem(cert).decode("utf-8")
-            
+
             certMap[id] = (
                 [h],
                 key.to_pem().decode("utf-8"),
@@ -172,7 +174,6 @@ def createExistingResponse(existing: Dict[str, Tuple[int | str, Key, List[Certif
     return CertificateResponse(certs, issued_certs)
 
 
-
 class CertificateResponse:
     def __init__(self, existing, issued):
         self.existing: List[IssuedCert] = existing
@@ -200,7 +201,7 @@ class IssuedCert:
             key = key.to_pem().decode("utf-8")
         elif isinstance(key, bytes):
             key = key.decode("utf-8")
-        
+
         if isinstance(cert, list):
             cert = certs_to_pem(cert).decode("utf-8")
         elif isinstance(cert, Certificate):

{certapi-0.2.7 → certapi-0.2.9}/src/certapi/crypto.py

@@ -106,18 +106,23 @@ def key_from_pem(data: bytes):
 def cert_from_pem(data: bytes) -> Certificate:
     return x509.load_pem_x509_certificate(data)
 
+
 def certs_from_pem(data: bytes) -> List[Certificate]:
     return x509.load_pem_x509_certificates(data)
 
+
 def cert_to_der(cert):
     return cert.public_bytes(serialization.Encoding.DER)
 
+
 def cert_to_pem(cert):
     return cert.public_bytes(serialization.Encoding.PEM)
 
+
 def certs_to_pem(certs: List[Certificate]) -> bytes:
     return b"".join([cert_to_pem(cert) for cert in certs])
 
+
 def cert_from_der(data: bytes) -> Certificate:
     return x509.load_der_x509_certificate(data)
 

{certapi-0.2.7 → certapi-0.2.9}/src/certapi/db.py

@@ -21,7 +21,9 @@ class KeyStore(ABC):
         pass
 
     @abstractmethod
-    def save_cert(self, private_key_id: int, cert: Certificate|str | List[Certificate] , domains: List[str], name: str = None) -> int:
+    def save_cert(
+        self, private_key_id: int, cert: Certificate | str | List[Certificate], domains: List[str], name: str = None
+    ) -> int:
         pass
 
     @abstractmethod
@@ -91,10 +93,12 @@ class SqliteKeyStore(KeyStore):
         self.save_key(key, name)
         return key
 
-    def save_cert(self, private_key_id: int, cert: Certificate|str | List[Certificate], domains: List[str], name: str = None) -> int:
+    def save_cert(
+        self, private_key_id: int, cert: Certificate | str | List[Certificate], domains: List[str], name: str = None
+    ) -> int:
         conn = self._get_db_connection()
         cur = conn.cursor()
-        
+
         if isinstance(cert, list):
             cert_data = certs_to_pem(cert)
         elif isinstance(cert, str):
@@ -133,7 +137,7 @@ class SqliteKeyStore(KeyStore):
 
         if res is None:
             return None
-        
+
         certs = certs_from_pem(res[2])
         return (res[0], Key.from_der(res[1]), certs)
 
@@ -194,8 +198,9 @@ class FilesystemKeyStore(KeyStore):
             return certs_from_pem(cert_data)
         return None
 
-
-    def save_cert(self, private_key_id: str, cert: Certificate | str | List[Certificate], domains: list, name: str = None) -> int:
+    def save_cert(
+        self, private_key_id: str, cert: Certificate | str | List[Certificate], domains: list, name: str = None
+    ) -> int:
         if isinstance(cert, list):
             cert_pem = certs_to_pem(cert)
         elif isinstance(cert, str):
@@ -226,7 +231,6 @@ class FilesystemKeyStore(KeyStore):
             with open(domain_cert_path, "wb") as f:
                 f.write(cert_pem)
 
-
         return name if name else domains[0]  # Dummy ID since filesystem does not use numeric IDs
 
     def get_cert(self, name: str) -> None | Tuple[str, Key, List[Certificate]]:
@@ -343,7 +347,9 @@ class PostgresKeyStore(KeyStore):
         self.save_key(key, name)
         return key
 
-    def save_cert(self, private_key_id: int, cert: Certificate | str | List[Certificate], domains: List[str], name: str = None) -> int:
+    def save_cert(
+        self, private_key_id: int, cert: Certificate | str | List[Certificate], domains: List[str], name: str = None
+    ) -> int:
         """Saves a certificate along with associated domains."""
         with self.get_connection() as conn:
             if isinstance(cert, list):

{certapi-0.2.7 → certapi-0.2.9}/src/certapi/digitalocean_challenge_store.py

@@ -34,7 +34,7 @@ class DigitalOceanChallengeStore(ChallengeStore):
         records = self.digitalocean.list_records(base_domain, name_filter=key)
         for record in records:
             if record["name"] == key:
-                return record["data"] # DigitalOcean API returns 'data' for TXT record content
+                return record["data"]  # DigitalOcean API returns 'data' for TXT record content
         return None  # Return None if not found, as per ChallengeStore's __getitem__ behavior
 
     def delete_challenge(self, key: str, domain: str):

{certapi-0.2.7 → certapi-0.2.9}/src/certapi/digitalocean_client.py

@@ -4,10 +4,9 @@ from os import getenv
 from urllib.request import urlopen, Request  # Python 3
 
 
-
 class DigitalOcean(object):
-    def __init__(self,api_key=None):
-        self.token=api_key
+    def __init__(self, api_key=None):
+        self.token = api_key
         self.api = "https://api.digitalocean.com/v2/domains"
         if not self.token:
             self.token = getenv("DIGITALOCEAN_API_TOKEN")
@@ -75,12 +74,12 @@ class DigitalOcean(object):
         response = urlopen(Request(api, headers=request_headers))
         if response.getcode() != 200:
             raise Exception(json.loads(response.read().decode("utf8")))
-        
+
         all_records = json.loads(response.read().decode("utf8"))["domain_records"]
-        
+
         if name_filter:
             filtered_records = [r for r in all_records if r["name"] == name_filter and r["type"] == "TXT"]
         else:
             filtered_records = [r for r in all_records if r["type"] == "TXT"]
-            
+
         return filtered_records

{certapi-0.2.7 → certapi-0.2.9}/src/certapi.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: certapi
-Version: 0.2.7
+Version: 0.2.9
 Summary: Python Package for managing keys, request SSL certificates from ACME.
 Home-page: https://github.com/mesudip/certapi
 Author: Sudip Bhattarai