certapi 0.4.1__tar.gz → 0.4.3__tar.gz

{certapi-0.4.1 → certapi-0.4.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: certapi
-Version: 0.4.1
+Version: 0.4.3
 Summary: Python Package for managing keys, request SSL certificates from ACME.
 Home-page: https://github.com/mesudip/certapi
 Author: Sudip Bhattarai
@@ -30,12 +30,12 @@ pip install certapi
 
 ```python
 import json
-from certapi import FileSystemChallengeStore, FilesystemKeyStore, CertAuthority
+from certapi import FileSystemChallengeSolver, FilesystemKeyStore, CertAuthority
 
 key_store = FilesystemKeyStore("data")
-challenge_store = FileSystemChallengeStore("./acme-challenges")  # this should be where your web server hosts the .well-known/
+challenge_solver = FileSystemChallengeSolver("./acme-challenges")  # this should be where your web server hosts the .well-known/
 
-certAuthority = CertAuthority(challenge_store, key_store)
+certAuthority = CertAuthority(challenge_solver, key_store)
 certAuthority.setup()
 
 (response,_) = certAuthority.obtainCert("example.com")

{certapi-0.4.1 → certapi-0.4.3}/README.md

@@ -17,12 +17,12 @@ pip install certapi
 
 ```python
 import json
-from certapi import FileSystemChallengeStore, FilesystemKeyStore, CertAuthority
+from certapi import FileSystemChallengeSolver, FilesystemKeyStore, CertAuthority
 
 key_store = FilesystemKeyStore("data")
-challenge_store = FileSystemChallengeStore("./acme-challenges")  # this should be where your web server hosts the .well-known/
+challenge_solver = FileSystemChallengeSolver("./acme-challenges")  # this should be where your web server hosts the .well-known/
 
-certAuthority = CertAuthority(challenge_store, key_store)
+certAuthority = CertAuthority(challenge_solver, key_store)
 certAuthority.setup()
 
 (response,_) = certAuthority.obtainCert("example.com")

{certapi-0.4.1 → certapi-0.4.3}/setup.py

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

certapi-0.4.3/src/certapi/__init__.py

@@ -0,0 +1,23 @@
+from .acme.Acme import Acme, Order, AcmeNetworkError, AcmeHttpError, Challenge
+from .manager.acme_cert_manager import AcmeCertManager
+from .http.types import CertificateResponse, IssuedCert
+
+from .crypto import (
+    Certificate,
+    CertificateSigningRequest,
+    CertificateSigningRequestBuilder,
+    Key,
+    Ed25519Key,
+    ECDSAKey,
+    Ed25519PrivateKey,
+    EllipticCurvePrivateKey,
+)
+from .keystore import FileSystemKeystore, SqliteKeyStore, PostgresKeyStore, KeyStore
+from .challenge_solver import (
+    ChallengeSolver,
+    InMemoryChallengeSolver,
+    FilesystemChallengeSolver,
+    CloudflareChallengeSolver,
+    DigitalOceanChallengeSolver,
+)
+from .issuers import SelfCertIssuer

{certapi-0.4.1 → certapi-0.4.3}/src/certapi/acme/Acme.py

@@ -9,23 +9,26 @@ from cryptography.hazmat.primitives.asymmetric.rsa import RSAPrivateKey
 from cryptography.x509 import CertificateSigningRequest, Certificate
 from certapi.crypto import crypto
 import requests
-from certapi.crypto import sign, digest_sha256, csr_to_der, jwk, get_algorithm_name, sign_for_jws,Key
+from certapi.crypto import Key
+from certapi.crypto.crypto_classes import ECDSAKey, RSAKey
 from certapi.util import b64_encode, b64_string
 from .AcmeError import *
 from .http import *
 from .Challenge import Challenge
 from .Order import Order
 
+
 class Acme:
 
     URL_STAGING = "https://acme-staging-v02.api.letsencrypt.org/directory"
     URL_PROD = "https://acme-v02.api.letsencrypt.org/directory"
 
-    def __init__(self, account_key: Union[RSAPrivateKey, EllipticCurvePrivateKey | Key], url=URL_STAGING):
-        self.account_key = account_key.key if isinstance(account_key, Key) else account_key
-        
+    def __init__(self, account_key: Key, url=URL_STAGING):
+        self.account_key: Key = account_key
+
         # json web key format for public key
-        self.jwk = jwk(self.account_key)
+        self.jwk = account_key.jwk()
+        self.alg_name = account_key.algorithm_name()
         print(self.jwk)
         self.nonce = []
         self.acme_url = url if url else os.environ.get("ACME_API_URL", self.URL_STAGING)
@@ -71,7 +74,7 @@ class Acme:
 
         protected = {
             "url": url,
-            "alg": get_algorithm_name(self.account_key),
+            "alg": self.alg_name,
             "nonce": self.get_nonce(step),
         }
 
@@ -79,11 +82,12 @@ class Acme:
             protected["kid"] = self.key_id
         else:
             protected["jwk"] = self.jwk
+
         protectedb64 = b64_encode(protected)
         payload = {
             "protected": protectedb64.decode("utf-8"),
             "payload": payload64.decode("utf-8"),
-            "signature": b64_string(sign_for_jws(self.account_key, b".".join([protectedb64, payload64]))),
+            "signature": b64_string(self.account_key.jws_sign(b".".join([protectedb64, payload64]))),
         }
         try:
 

{certapi-0.4.1 → certapi-0.4.3}/src/certapi/acme/AcmeError.py

@@ -1,3 +1,4 @@
+import re
 import requests
 
 
@@ -47,6 +48,7 @@ class AcmeHttpError(AcmeError, requests.HTTPError):
                     failed_challenge: dict = [x for x in res_json["challenges"] if x["status"] == "invalid"][0]
                     error = failed_challenge["error"]
                     err_detail: str = error.get("detail")
+                    err_type: str = error.get("type")
                     validation_record: dict = failed_challenge.get("validationRecord")
                     error = {
                         "url": failed_challenge["url"],
@@ -70,7 +72,7 @@ class AcmeHttpError(AcmeError, requests.HTTPError):
                             "resolved": validation_record["addressesResolved"],
                             "used": validation_record["addressUsed"],
                         }
-                        if error["type"] == "urn:ietf:params:acme:error:connection":
+                        if err_type == "urn:ietf:params:acme:error:connection":
                             if "Timeout during connect" in err_detail:
                                 error["connect"] = {"error": "Timeout"}
                                 message = (

{certapi-0.4.1 → certapi-0.4.3}/src/certapi/acme/Challenge.py

@@ -1,4 +1,3 @@
-
 import json
 from typing import Literal, Union
 
@@ -7,7 +6,8 @@ import requests
 from certapi.util import b64_encode, b64_string
 from certapi.crypto import digest_sha256
 from .AcmeError import *
-from .http import post,get
+from .http import post, get
+
 
 class Challenge:
     def __init__(self, auth_url, data, acme):
@@ -15,7 +15,7 @@ class Challenge:
         self._acme = acme
         self._data = data
         challenge = self.get_challenge()
-        self.token:str = challenge["token"]
+        self.token: str = challenge["token"]
         self.verified = challenge["status"] == "valid"
         self.domain = data["identifier"]["value"]  # Add domain attribute
 
@@ -25,23 +25,22 @@ class Challenge:
 
         self.url = "http://{0}/.well-known/acme-challenge/{1}".format(data["identifier"]["value"], self.token)
 
-    def as_key_value(self,type:Literal["http-01", "dns-01", "tls-alpn-01"]=None):
-        challenge=self.get_challenge(type)
+    def as_key_value(self, type: Literal["http-01", "dns-01", "tls-alpn-01"] = None):
+        challenge = self.get_challenge(type)
 
         if challenge["type"] == "dns-01":
             key = f"_acme-challenge.{self.domain}"
             value = b64_string(digest_sha256(self.authorization_key.encode("utf8")))
         else:
-            key =  self.token
-            value =  self.authorization_key
-        
-        return (key,value)
+            key = self.token
+            value = self.authorization_key
 
+        return (key, value)
 
-    def verify(self, type:Literal["http-01", "dns-01", "tls-alpn-01"]=None) -> bool:
+    def verify(self, type: Literal["http-01", "dns-01", "tls-alpn-01"] = None) -> bool:
         if not self.verified:
             response = self._acme._signed_req(
-                self.get_challenge(type)["url"], {}, step="Verify Challenge", throw=False
+                self.get_challenge(type)["url"], {}, step=f"Verify Challenge [{self.domain}]", throw=False
             )
             if response.status_code == 200 and response.json()["status"] == "valid":
                 self.verified = True
@@ -52,7 +51,7 @@ class Challenge:
     def self_verify(self) -> Union[bool, requests.Response]:
         identifier = self._data["identifier"]
         if identifier["type"] == "dns":
-            res = get("Self Domain verification", self.url)
+            res = get(f"Self Domain verification [{self.domain}]", self.url)
             if res.status_code == 200 and res.content == self.token.encode():
                 return True
             else:
@@ -63,19 +62,19 @@ class Challenge:
         if self.verified:
             return True
         else:
-            res = self._acme._signed_req(self._auth_url, step="Acme Challenge Verification")
+            res = self._acme._signed_req(self._auth_url, step=f"Query Challenge Status [{self.domain}]")
             res_json = res.json()
             if res_json["status"] == "valid":
                 self.verified = True
                 return True
             elif res_json["status"] == "invalid":
-                raise AcmeInvaliOrderError(res, "Acme Challenge Verification")
+                raise AcmeInvaliOrderError(res, "Query Challenge Status")
             else:
                 return False
 
-    def get_challenge(self, type:Literal["http-01", "dns-01", "tls-alpn-01"]=None):
+    def get_challenge(self, type: Literal["http-01", "dns-01", "tls-alpn-01"] = None):
         challenges = self._data["challenges"]
-        def_key= type if type is not None else "http-01"
+        def_key = type if type is not None else "http-01"
         for method in challenges:
             if method["type"] == def_key:
                 return method
@@ -84,7 +83,7 @@ class Challenge:
 
         ch_types = [x["type"] for x in self._data["challenges"]]
         raise AcmeError(
-            f"'{type}' not found in challenges. available:{str(ch_types)}",
+            f"'{type}' not found in challenges for {self.domain}, available: {','.join(ch_types)}",
             {"response": self._data["challenges"]},
-            "Acme Challenge Verification",
+            "Query Challenge Status",
         )

{certapi-0.4.1 → certapi-0.4.3}/src/certapi/acme/Order.py

@@ -1,10 +1,11 @@
 from typing import List, Tuple
-from certapi.crypto import crypto,csr_to_der
+from certapi.crypto import crypto, csr_to_der
 from certapi.util import b64_string
-from cryptography.x509 import CertificateSigningRequest,Certificate
+from cryptography.x509 import CertificateSigningRequest, Certificate
 from .Challenge import *
 from .http import get
 
+
 class Order:
     def __init__(self, url, data, challenges, acme):
         self.url = url

{certapi-0.4.1 → certapi-0.4.3}/src/certapi/acme/__init__.py

@@ -1,4 +1,4 @@
 from .Challenge import Challenge
 from .AcmeError import *
 from .Acme import Acme
-from .Order import Order
+from .Order import Order

{certapi-0.4.1 → certapi-0.4.3}/src/certapi/acme/http.py

@@ -1,7 +1,7 @@
-
 import requests
 from .AcmeError import *
 
+
 def request(method, step: str, url: str, json=None, headers=None, throw=True) -> requests.Response:
     res = None
     try:
@@ -53,4 +53,3 @@ def post(step: str, url: str, json=None, headers=None, throw=True) -> requests.R
 
 def get(step: str, url) -> requests.Response:
     return request("GET", step, url)
-

certapi-0.4.1/src/certapi/challenge_store/ChallengeStore.py → certapi-0.4.3/src/certapi/challenge_solver/ChallengeSolver.py

@@ -1,12 +1,14 @@
 from abc import ABC, abstractmethod
 import os
 from collections.abc import MutableMapping
+from typing import Literal
 
 
-class ChallengeStore(ABC):
+class ChallengeSolver(ABC):
     """
     Abstract base class for a challenge store.
     """
+
     @abstractmethod
     def supports_domain(self, domain: str) -> bool:
         pass
@@ -22,13 +24,13 @@ class ChallengeStore(ABC):
     @abstractmethod
     def delete_challenge(self, key: str, domain: str = None):
         pass
-    def store_details():
-        return {
-            "name": "Abstract Challenge Store",
-        }
+
+    @abstractmethod
+    def supported_challenge_type(self) -> Literal["http-01", "dns-01", "tls-alpn-01"]:
+        pass
 
     def __iter__(self):
         raise NotImplementedError("Must implement `__iter__` method.")
 
     def __len__(self):
-        raise NotImplementedError("Must implement `__len__` method.")
+        raise NotImplementedError("Must implement `__len__` method.")

certapi-0.4.1/src/certapi/challenge_store/FileSystemChallengeStore.py → certapi-0.4.3/src/certapi/challenge_solver/FileSystemChallengeSolver.py

@@ -1,10 +1,12 @@
-
-from .ChallengeStore import ChallengeStore
+from typing import Literal
+from .ChallengeSolver import ChallengeSolver
 import os
 
-class FileSystemChallengeStore(ChallengeStore):
+
+class FilesystemChallengeSolver(ChallengeSolver):
     """
     Filesystem implementation of the ChallengeStore.
+    This should never be used, but extended for your webserver e.g. nginx, apache etc.
     """
 
     def __init__(self, directory: str):
@@ -12,7 +14,7 @@ class FileSystemChallengeStore(ChallengeStore):
         os.makedirs(self.directory, exist_ok=True)
 
     def supports_domain(self, domain: str) -> bool:
-        return True
+        return "*" not in domain
 
     def save_challenge(self, key: str, value: str, domain: str = None):
         file_path = os.path.join(self.directory, key)
@@ -31,6 +33,9 @@ class FileSystemChallengeStore(ChallengeStore):
         if os.path.exists(file_path):
             os.remove(file_path)
 
+    def supported_challenge_type(self) -> Literal["http-01"]:
+        return "http-01"
+
     def __iter__(self):
         return (f for f in os.listdir(self.directory) if os.path.isfile(os.path.join(self.directory, f)))
 

certapi-0.4.1/src/certapi/challenge_store/InmemoryChallengeStore.py → certapi-0.4.3/src/certapi/challenge_solver/InmemoryChallengeSolver.py

@@ -1,7 +1,8 @@
-from .ChallengeStore import ChallengeStore
+from typing import Literal
+from .ChallengeSolver import ChallengeSolver
 
 
-class InMemoryChallengeStore(ChallengeStore):
+class InMemoryChallengeSolver(ChallengeSolver):
     """
     In-memory implementation of the ChallengeStore.
     """
@@ -9,6 +10,9 @@ class InMemoryChallengeStore(ChallengeStore):
     def __init__(self):
         self.challenges = {}
 
+    def supported_challenge_type(self) -> Literal["http-01"]:
+        return "http-01"
+
     def save_challenge(self, key: str, value: str, domain: str = None):
         self.challenges[key] = value
 

certapi-0.4.3/src/certapi/challenge_solver/__init__.py

@@ -0,0 +1,24 @@
+from .ChallengeSolver import ChallengeSolver
+from .InmemoryChallengeSolver import InMemoryChallengeSolver
+import os
+from .FileSystemChallengeSolver import FilesystemChallengeSolver
+from .dns import CloudflareChallengeSolver, DigitalOceanChallengeSolver
+
+
+def get_challenge_solver():
+    """
+    Factory function to determine the type of store based on environment variables.
+
+    Environment Variables:
+    - `challenge_solver_TYPE`: Can be "memory" or "filesystem".
+    - `challenge_solver_DIR`: Directory for filesystem-based store. Defaults to "./challenges".
+    """
+    store_type = os.getenv("challenge_solver_TYPE", "filesystem").lower()
+    directory = os.getenv("challenge_solver_DIR", "./challenges")
+
+    if store_type == "memory":
+        return InMemoryChallengeSolver()
+    elif store_type == "filesystem":
+        return FilesystemChallengeSolver(directory)
+    else:
+        raise ValueError(f"Unknown challenge_solver_TYPE: {store_type}")

certapi-0.4.3/src/certapi/challenge_solver/dns/__init__.py

@@ -0,0 +1,2 @@
+from .digitalocean.digitalocean_challenge_solver import DigitalOceanChallengeSolver
+from .cloudflare.cloudflare_challenge_solver import CloudflareChallengeSolver

certapi-0.4.1/src/certapi/challenge_store/dns/cloudflare/cloudflare_challenge_store.py → certapi-0.4.3/src/certapi/challenge_solver/dns/cloudflare/cloudflare_challenge_solver.py

@@ -1,15 +1,19 @@
 import os
 import time
 from collections.abc import MutableMapping
-from ...ChallengeStore import ChallengeStore
+from typing import Literal
+from ...ChallengeSolver import ChallengeSolver
 from .cloudflare_client import Cloudflare
 
 
-class CloudflareChallengeStore(ChallengeStore):
-    def __init__(self,api_key:str=None):
+class CloudflareChallengeSolver(ChallengeSolver):
+    def __init__(self, api_key: str = None):
         self.cloudflare = Cloudflare(api_key)
-        self.challenges_map = {} 
-    
+        self.challenges_map = {}
+
+    def supported_challenge_type(self) -> Literal["dns-01"]:
+        return "dns-01"
+
     def supports_domain(self, domain: str) -> bool:
         """
         Checks if the Cloudflare account has access to the given domain (or its base domain)
@@ -28,8 +32,7 @@ class CloudflareChallengeStore(ChallengeStore):
 
         record_id = self.cloudflare.create_record(name=key, data=value, domain=base_domain)
         self.challenges_map[key] = record_id
-        print(f"CloudflareChallengeStore: Saved challenge for {key} with record ID {record_id}")
-        time.sleep(10) # wait for dns propagation. it may not be immediate
+        print(f"CloudflareChallengeStore[{domain}]: Added Record {key}")
 
     def get_challenge(self, key: str, domain: str) -> str:
         base_domain = self.cloudflare.determine_registered_domain(domain)

{certapi-0.4.1/src/certapi/challenge_store → certapi-0.4.3/src/certapi/challenge_solver}/dns/cloudflare/cloudflare_client.py

@@ -7,7 +7,7 @@ from urllib.request import urlopen, Request
 class Cloudflare(object):
     name = "cloudflare"
 
-    def __init__(self,api_key:str):
+    def __init__(self, api_key: str):
         self.token = api_key
         self.api = "https://api.cloudflare.com/client/v4"
         if not self.token:
@@ -85,6 +85,7 @@ class Cloudflare(object):
 
         result = json.loads(response.read().decode("utf8"))
         if not result.get("success"):
+            print(f"List TXT record [{response.getcode()}]", result)
             raise Exception(result.get("errors", "Unknown error listing TXT records"))
 
         return result["result"]
@@ -111,11 +112,11 @@ class Cloudflare(object):
             "proxied": False,
         }
         response = urlopen(Request(api_url, data=json.dumps(request_data).encode("utf8"), headers=request_headers))
-
+        result = response.read().decode("utf8")
         if response.getcode() != 200:
+            print(f"Create TXT record [{response.getcode()}]", result)
             raise Exception(json.loads(response.read().decode("utf8")))
-        result = response.read().decode("utf8")
-        print("Cloudflare create record", name, result)
+
         return json.loads(result)["result"]["id"]
 
     def delete_record(self, record, domain):
@@ -133,6 +134,6 @@ class Cloudflare(object):
         request.get_method = lambda: "DELETE"
         response = urlopen(request)
         result = response.read().decode("utf8")
-        print(f"Delete dns record [{response.getcode()}]", result)
         if response.getcode() != 200:
+            print(f"Delete dns record [{response.getcode()}]", result)
             raise Exception(json.loads(response.read().decode("utf8")))

certapi-0.4.1/src/certapi/challenge_store/dns/digitalocean/digitalocean_challenge_store.py → certapi-0.4.3/src/certapi/challenge_solver/dns/digitalocean/digitalocean_challenge_solver.py

@@ -1,14 +1,18 @@
 import os
 from collections.abc import MutableMapping
-from ...ChallengeStore import ChallengeStore
+from typing import Literal
+from ...ChallengeSolver import ChallengeSolver
 from .digitalocean_client import DigitalOcean
 
 
-class DigitalOceanChallengeStore(ChallengeStore):
-    def __init__(self,api_key:str=None):
+class DigitalOceanChallengeSolver(ChallengeSolver):
+    def __init__(self, api_key: str = None):
         self.digitalocean = DigitalOcean(api_key)
         self.challenges_map = {}  # Stores key: record_id (needed for deletion)
 
+    def supported_challenge_type(self) -> Literal["dns-01"]:
+        return "dns-01"
+
     def supports_domain(self, domain: str) -> bool:
         """
         Checks if the DigitalOcean account has access to the given domain (or its base domain)

{certapi-0.4.1/src/certapi/challenge_store → certapi-0.4.3/src/certapi/challenge_solver}/dns/digitalocean/digitalocean_client.py

@@ -5,7 +5,7 @@ from urllib.request import urlopen, Request  # Python 3
 
 
 class DigitalOcean(object):
-    def __init__(self, api_key:str=None):
+    def __init__(self, api_key: str = None):
         self.token = api_key
         self.api = "https://api.digitalocean.com/v2/domains"
         if not self.token:

{certapi-0.4.1 → certapi-0.4.3}/src/certapi/client/cert_manager_client.py

@@ -2,6 +2,7 @@ import requests
 from typing import List, Union, Dict, Optional, Any
 from certapi.http.types import CertificateResponse, IssuedCert
 
+
 class CertManagerClient:
     def __init__(self, base_url: str):
         self.base_url = base_url
@@ -11,8 +12,15 @@ class CertManagerClient:
         response.raise_for_status()
         return response.json()
 
-    def _post(self, path: str, data: Optional[Union[Dict[str, Any], str]] = None, headers: Optional[Dict[str, str]] = None) -> Any:
-        response = requests.post(f"{self.base_url}{path}", json=data if isinstance(data, dict) else None, data=data if isinstance(data, str) else None, headers=headers)
+    def _post(
+        self, path: str, data: Optional[Union[Dict[str, Any], str]] = None, headers: Optional[Dict[str, str]] = None
+    ) -> Any:
+        response = requests.post(
+            f"{self.base_url}{path}",
+            json=data if isinstance(data, dict) else None,
+            data=data if isinstance(data, str) else None,
+            headers=headers,
+        )
         response.raise_for_status()
         return response.json()
 
@@ -32,17 +40,24 @@ class CertManagerClient:
             "key_type": key_type,
             "expiry_days": expiry_days,
         }
-        if country: params["country"] = country
-        if state: params["state"] = state
-        if locality: params["locality"] = locality
-        if organization: params["organization"] = organization
-        if user_id: params["user_id"] = user_id
+        if country:
+            params["country"] = country
+        if state:
+            params["state"] = state
+        if locality:
+            params["locality"] = locality
+        if organization:
+            params["organization"] = organization
+        if user_id:
+            params["user_id"] = user_id
 
         data = self._get("/obtain", params=params)
         return CertificateResponse.from_json(data)
 
     def sign_csr(self, csr_pem: str) -> str:
-        response = requests.post(f"{self.base_url}/sign_csr", data=csr_pem, headers={'Content-Type': 'application/x-pem-file'})
+        response = requests.post(
+            f"{self.base_url}/sign_csr", data=csr_pem, headers={"Content-Type": "application/x-pem-file"}
+        )
         response.raise_for_status()
         return response.text
 
@@ -88,11 +103,14 @@ class CertManagerClient:
                 return None
             raise
 
-    def save_cert(self, private_key_id: Union[int, str], cert_pem: str, domains: List[str], name: Optional[str] = None) -> Dict[str, Any]:
+    def save_cert(
+        self, private_key_id: Union[int, str], cert_pem: str, domains: List[str], name: Optional[str] = None
+    ) -> Dict[str, Any]:
         data = {
             "private_key_id": private_key_id,
             "cert": cert_pem,
             "domains": domains,
         }
-        if name: data["name"] = name
-        return self._post("/certs", data=data)
+        if name:
+            data["name"] = name
+        return self._post("/certs", data=data)

certapi-0.4.3/src/certapi/crypto/__init__.py

@@ -0,0 +1,2 @@
+from .crypto import *
+from .crypto_classes import *

{certapi-0.4.1 → certapi-0.4.3}/src/certapi/crypto/crypto.py

@@ -10,11 +10,11 @@ from cryptography.hazmat.primitives.asymmetric.ed25519 import Ed25519PrivateKey
 from cryptography.hazmat.primitives.asymmetric.rsa import RSAPrivateKey
 from cryptography.x509 import Certificate, CertificateSigningRequestBuilder, CertificateSigningRequest
 
-from cryptography.x509.oid import NameOID,ExtensionOID
+from cryptography.x509.oid import NameOID, ExtensionOID
 from cryptography.hazmat.primitives import hashes
 
 
-from certapi.util import  b64_string
+from certapi.util import b64_string
 
 __no_enc = serialization.NoEncryption()
 
@@ -177,6 +177,7 @@ def digest_sha256(data: bytes) -> bytes:
     h.update(data)
     return h.finalize()
 
+
 def get_csr_hostnames(csr: x509.CertificateSigningRequest):
 
     domains = []
@@ -203,4 +204,4 @@ def get_csr_hostnames(csr: x509.CertificateSigningRequest):
             seen.add(d)
             unique_domains.append(d)
 
-    return unique_domains
+    return unique_domains