certapi 0.2.5__tar.gz → 0.2.8__tar.gz

{certapi-0.2.5 → certapi-0.2.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: certapi
-Version: 0.2.5
+Version: 0.2.8
 Summary: Python Package for managing keys, request SSL certificates from ACME.
 Home-page: https://github.com/mesudip/certapi
 Author: Sudip Bhattarai
@@ -14,7 +14,7 @@ Description-Content-Type: text/markdown
 # CertApi
 
 CertApi is a Python package for requesting SSL certificates from ACME.
-This is supposed to be used as a base library for building other tools, or to integrate Certificate creation feature in you app.
+This is to be used as a base library for building other tools, or to integrate Certificate creation feature in you app.
 
 > ⚠️ Warning: This project is not polished for production use. Please stay tuned for the LTS `v1.0.0` release.
 

{certapi-0.2.5 → certapi-0.2.8}/README.md

@@ -1,7 +1,7 @@
 # CertApi
 
 CertApi is a Python package for requesting SSL certificates from ACME.
-This is supposed to be used as a base library for building other tools, or to integrate Certificate creation feature in you app.
+This is to be used as a base library for building other tools, or to integrate Certificate creation feature in you app.
 
 > ⚠️ Warning: This project is not polished for production use. Please stay tuned for the LTS `v1.0.0` release.
 

{certapi-0.2.5 → certapi-0.2.8}/setup.py

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

{certapi-0.2.5 → certapi-0.2.8}/src/certapi/Acme.py

@@ -72,9 +72,12 @@ class AcmeHttpError(AcmeError, requests.HTTPError):
                             error["dns"] = {"error": "DNS record doesn't exist"}
                             error["hostname"] = re.findall(r"looking up [A-Z]+ for ([\w.-]+)", err_detail)[0]
                             message = error["hostname"] + " doesn't have a valid DNS record"
-                        else:
+                        elif err_detail:
                             error["dns"] = {"error": err_detail}
                             message = err_detail
+                        else:
+                            error["dns"] = {"error": error}
+                            message = err_detail
                     else:
                         validation_record = validation_record[0]
                         error["hostname"] = validation_record["hostname"]
@@ -103,9 +106,11 @@ class AcmeHttpError(AcmeError, requests.HTTPError):
                                     + validation_record["port"]
                                     + "] Connection Refused (Is http server running?)"
                                 )
-                            else:
+                            elif err_detail:
                                 message = err_detail
-                        else:
+                            else:
+                                message = error
+                        elif err_detail:
                             pattern = r'Invalid response from .*?: "(.*)"'
 
                             match = re.search(pattern, err_detail)
@@ -121,6 +126,8 @@ class AcmeHttpError(AcmeError, requests.HTTPError):
                                 )
                             else:
                                 message = err_detail
+                        else:
+                            message = error
 
             if message is None:
                 if res_json.get("detail"):
@@ -338,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.5 → certapi-0.2.8}/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[0], missing)
+                    cert_id = self.key_store.save_cert(key_id, certificate, 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, Certificate | str]], issued_certs: List["IssuedCert"]):
+def createExistingResponse(
+    existing: Dict[str, Tuple[int | str, Key, List[Certificate] | str]], issued_certs: List["IssuedCert"]
+):
     certs = []
     certMap = {}
 
@@ -153,7 +155,13 @@ def createExistingResponse(existing: Dict[str, Tuple[int | str, Key, Certificate
         if id in certMap:
             certMap[id][0].append(h)
         else:
-            cert_pem = cert if isinstance(cert, str) else cert_to_pem(cert).decode("utf-8")
+            if isinstance(cert, str):
+                cert_pem = cert
+            elif isinstance(cert, list):
+                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"),
@@ -166,7 +174,6 @@ def createExistingResponse(existing: Dict[str, Tuple[int | str, Key, Certificate
     return CertificateResponse(certs, issued_certs)
 
 
-
 class CertificateResponse:
     def __init__(self, existing, issued):
         self.existing: List[IssuedCert] = existing
@@ -189,15 +196,19 @@ class CertificateResponse:
 
 
 class IssuedCert:
-    def __init__(self, key: str | Key, cert: str | Certificate, domains: [str]):
+    def __init__(self, key: str | Key, cert: str | Certificate | List[Certificate], domains: [str]):
         if isinstance(key, Key):
             key = key.to_pem().decode("utf-8")
         elif isinstance(key, bytes):
             key = key.decode("utf-8")
-        if isinstance(cert, Certificate):
+
+        if isinstance(cert, list):
+            cert = certs_to_pem(cert).decode("utf-8")
+        elif isinstance(cert, Certificate):
             cert = cert_to_pem(cert).decode("utf-8")
         elif isinstance(cert, bytes):
             cert = cert.decode("utf-8")
+
         self.privateKey = key
         self.certificate = cert
         self.domains = domains

{certapi-0.2.5 → certapi-0.2.8}/src/certapi/crypto.py

@@ -106,16 +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.5 → certapi-0.2.8}/src/certapi/db.py

@@ -21,11 +21,13 @@ class KeyStore(ABC):
         pass
 
     @abstractmethod
-    def save_cert(self, private_key_id: int, cert: Certificate|str, 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
-    def get_cert(self, domain: str) -> None | Tuple[int | str, Key, Certificate]:
+    def get_cert(self, domain: str) -> None | Tuple[int | str, Key, Certificate | List[Certificate]]:
         pass
 
 
@@ -91,12 +93,22 @@ class SqliteKeyStore(KeyStore):
         self.save_key(key, name)
         return key
 
-    def save_cert(self, private_key_id: int, cert: Certificate|str, 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):
+            cert_data = cert.encode()
+        else:
+            cert_data = cert_to_pem(cert)
+
         cur.execute(
             "INSERT INTO certificates (name, priv_id, content) VALUES (?, ?, ?)",
-            (name, private_key_id, cert_to_der(cert)),
+            (name, private_key_id, cert_data),
         )
         cert_id = cur.lastrowid
 
@@ -106,7 +118,7 @@ class SqliteKeyStore(KeyStore):
         conn.commit()
         return cert_id
 
-    def get_cert(self, domain: str) -> None | Tuple[int | str, Key, Certificate]:
+    def get_cert(self, domain: str) -> None | Tuple[int | str, Key, List[Certificate]]:
         conn = self._get_db_connection()
         cur = conn.cursor()
         cur.execute(
@@ -123,7 +135,11 @@ class SqliteKeyStore(KeyStore):
 
         cur.close()
 
-        return res if res is None else (res[0], Key.from_der(res[1]), cert_from_der(res[2]))
+        if res is None:
+            return None
+
+        certs = certs_from_pem(res[2])
+        return (res[0], Key.from_der(res[1]), certs)
 
     def _init_account_key(self) -> RSAPrivateKey:
         acme_key_name = "ACME Account Key"
@@ -174,20 +190,23 @@ class FilesystemKeyStore(KeyStore):
             return key_from_pem(key_data)
         return None
 
-    def find_cert(self, name: str) -> Union[None, Certificate]:
+    def find_cert(self, name: str) -> Union[None, List[Certificate]]:
         cert_path = os.path.join(self.certs_dir, f"{name}.crt")
         if os.path.exists(cert_path):
             with open(cert_path, "rb") as f:
                 cert_data = f.read()
-            return cert_from_pem(cert_data)
+            return certs_from_pem(cert_data)
         return None
 
-
-    def save_cert(self, private_key_id: str, cert: Certificate | str, domains: list, name: str = None) -> int:
-        def get_cert_pem(cert) -> bytes:
-            return cert.encode() if isinstance(cert, str) else cert_to_pem(cert)
-
-        cert_pem = get_cert_pem(cert)
+    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):
+            cert_pem = cert.encode()
+        else:
+            cert_pem = cert_to_pem(cert)
 
         if name:
             cert_path = os.path.join(self.certs_dir, f"{name}.crt")
@@ -212,10 +231,9 @@ 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, Certificate]:
+    def get_cert(self, name: str) -> None | Tuple[str, Key, List[Certificate]]:
         cert_path = os.path.join(self.certs_dir, f"{name}.crt")
         key_path = os.path.join(self.keys_dir, f"{name}.key")
         key = None
@@ -230,7 +248,7 @@ class FilesystemKeyStore(KeyStore):
         if os.path.exists(cert_path):
             try:
                 with open(cert_path, "rb") as f:
-                    cert = cert_from_pem(f.read())
+                    cert = certs_from_pem(f.read())
             except ValueError:
                 pass
 
@@ -329,13 +347,22 @@ class PostgresKeyStore(KeyStore):
         self.save_key(key, name)
         return key
 
-    def save_cert(self, private_key_id: int, cert: 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):
+                cert_data = certs_to_pem(cert)
+            elif isinstance(cert, str):
+                cert_data = cert.encode()
+            else:
+                cert_data = cert_to_pem(cert)
+
             # Insert certificate and associated domains directly
             conn.execute(
                 "INSERT INTO certificates (name, priv_id, content) VALUES (%s, %s, %s) RETURNING id",
-                (name, private_key_id, cert.public_bytes(serialization.Encoding.DER)),
+                (name, private_key_id, cert_data),
             )
             cert_id = conn.fetchone()[0]
 
@@ -345,7 +372,7 @@ class PostgresKeyStore(KeyStore):
 
         return cert_id
 
-    def get_cert(self, domain: str) -> Optional[Tuple[int, RSAPrivateKey, Certificate]]:
+    def get_cert(self, domain: str) -> Optional[Tuple[int, RSAPrivateKey, List[Certificate]]]:
         """Fetches a certificate and its associated private key for a domain."""
         with self.get_connection() as conn:
             # Directly execute and fetch result
@@ -362,7 +389,7 @@ class PostgresKeyStore(KeyStore):
             res = conn.fetchone()
 
             if res:
-                return (res[0], Key.from_der(res[1]), cert_from_der(res[2]))
+                return (res[0], Key.from_der(res[1]), certs_from_pem(res[2]))
         return None
 
     def _init_account_key(self) -> RSAPrivateKey:

{certapi-0.2.5 → certapi-0.2.8}/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.5 → certapi-0.2.8}/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.5 → certapi-0.2.8}/src/certapi.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: certapi
-Version: 0.2.5
+Version: 0.2.8
 Summary: Python Package for managing keys, request SSL certificates from ACME.
 Home-page: https://github.com/mesudip/certapi
 Author: Sudip Bhattarai
@@ -14,7 +14,7 @@ Description-Content-Type: text/markdown
 # CertApi
 
 CertApi is a Python package for requesting SSL certificates from ACME.
-This is supposed to be used as a base library for building other tools, or to integrate Certificate creation feature in you app.
+This is to be used as a base library for building other tools, or to integrate Certificate creation feature in you app.
 
 > ⚠️ Warning: This project is not polished for production use. Please stay tuned for the LTS `v1.0.0` release.