certapi 0.4.5__tar.gz → 0.4.7__tar.gz

{certapi-0.4.5/src/certapi.egg-info → certapi-0.4.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: certapi
-Version: 0.4.5
+Version: 0.4.7
 Summary: Python Package for managing keys, request SSL certificates from ACME.
 Home-page: https://github.com/mesudip/certapi
 Author: Sudip Bhattarai
@@ -26,27 +26,21 @@ You can install CertApi using pip
 pip install certapi
 ```
 
-## Use Low level API
+## Example: Obtain Certificate with Cloudflare
 
 ```python
 import json
-import os
-from certapi import FileSystemKeyStore, CertApiException, CloudflareChallengeSolver, AcmeCertManager, AcmeCertIssuer
+from certapi import CertApiException, CloudflareChallengeSolver, Key, AcmeCertIssuer
 
 
-# Initialize the key store and create acme account key
-key_store = FileSystemKeyStore("data")
-
-acme_key = key_store._get_or_generate_key("acme_account", "rsa")[0]
-
 # Initialize the Cloudflare challenge solver
 # The API key is read from the CLOUDFLARE_API_KEY environment variable, or you can set it below.
 challenge_solver = CloudflareChallengeSolver(api_key=None)
 
-## initialize cert issuer
-cert_issuer = AcmeCertIssuer(acme_key, challenge_solver)
+## initialize cert issuer with a new account key
+cert_issuer = AcmeCertIssuer(Key.generate('rsa'), challenge_solver)
 
-# Setup ACME account.
+# Preform setup i.e. fetching directory and registering ACME account
 cert_issuer.setup()
 
 try:
@@ -61,3 +55,9 @@ except CertApiException as e:
     print(f"An error occurred:", json.dumps(e.json_obj(), indent=2))
 
 ```
+
+
+## Example: Use High Leve API
+
+```
+```

{certapi-0.4.5 → certapi-0.4.7}/README.md

@@ -13,27 +13,21 @@ You can install CertApi using pip
 pip install certapi
 ```
 
-## Use Low level API
+## Example: Obtain Certificate with Cloudflare
 
 ```python
 import json
-import os
-from certapi import FileSystemKeyStore, CertApiException, CloudflareChallengeSolver, AcmeCertManager, AcmeCertIssuer
+from certapi import CertApiException, CloudflareChallengeSolver, Key, AcmeCertIssuer
 
 
-# Initialize the key store and create acme account key
-key_store = FileSystemKeyStore("data")
-
-acme_key = key_store._get_or_generate_key("acme_account", "rsa")[0]
-
 # Initialize the Cloudflare challenge solver
 # The API key is read from the CLOUDFLARE_API_KEY environment variable, or you can set it below.
 challenge_solver = CloudflareChallengeSolver(api_key=None)
 
-## initialize cert issuer
-cert_issuer = AcmeCertIssuer(acme_key, challenge_solver)
+## initialize cert issuer with a new account key
+cert_issuer = AcmeCertIssuer(Key.generate('rsa'), challenge_solver)
 
-# Setup ACME account.
+# Preform setup i.e. fetching directory and registering ACME account
 cert_issuer.setup()
 
 try:
@@ -48,3 +42,9 @@ except CertApiException as e:
     print(f"An error occurred:", json.dumps(e.json_obj(), indent=2))
 
 ```
+
+
+## Example: Use High Leve API
+
+```
+```

{certapi-0.4.5 → certapi-0.4.7}/setup.py

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

{certapi-0.4.5 → certapi-0.4.7}/src/certapi/__init__.py

@@ -1,4 +1,4 @@
-from .acme.Acme import Acme, Order, AcmeNetworkError, AcmeHttpError, Challenge
+from .acme.Acme import Acme, Order, AcmeNetworkError, AcmeHttpError,AcmeError, Challenge
 from .manager.acme_cert_manager import AcmeCertManager
 from .http.types import CertificateResponse, IssuedCert
 from .errors import CertApiException

{certapi-0.4.5 → certapi-0.4.7}/src/certapi/acme/Acme.py

@@ -29,7 +29,6 @@ class Acme:
         # json web key format for public 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)
         self.key_id = None

{certapi-0.4.5 → certapi-0.4.7}/src/certapi/challenge_solver/dns/cloudflare/cloudflare_challenge_solver.py

@@ -33,7 +33,7 @@ class CloudflareChallengeSolver(ChallengeSolver):
 
         record_id = self.cloudflare.create_record(name=key, data=value, domain=domain)
         self.challenges_map[key] = record_id
-        print(f"CloudflareChallengeSolver[{domain}]: Added Record {key}")
+        print(f"CloudflareChallengeSolver [ {domain} ]: Added Record {key}")
 
     def get_challenge(self, key: str, domain: str) -> str:
         if domain is None:

{certapi-0.4.5 → certapi-0.4.7/src/certapi.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: certapi
-Version: 0.4.5
+Version: 0.4.7
 Summary: Python Package for managing keys, request SSL certificates from ACME.
 Home-page: https://github.com/mesudip/certapi
 Author: Sudip Bhattarai
@@ -26,27 +26,21 @@ You can install CertApi using pip
 pip install certapi
 ```
 
-## Use Low level API
+## Example: Obtain Certificate with Cloudflare
 
 ```python
 import json
-import os
-from certapi import FileSystemKeyStore, CertApiException, CloudflareChallengeSolver, AcmeCertManager, AcmeCertIssuer
+from certapi import CertApiException, CloudflareChallengeSolver, Key, AcmeCertIssuer
 
 
-# Initialize the key store and create acme account key
-key_store = FileSystemKeyStore("data")
-
-acme_key = key_store._get_or_generate_key("acme_account", "rsa")[0]
-
 # Initialize the Cloudflare challenge solver
 # The API key is read from the CLOUDFLARE_API_KEY environment variable, or you can set it below.
 challenge_solver = CloudflareChallengeSolver(api_key=None)
 
-## initialize cert issuer
-cert_issuer = AcmeCertIssuer(acme_key, challenge_solver)
+## initialize cert issuer with a new account key
+cert_issuer = AcmeCertIssuer(Key.generate('rsa'), challenge_solver)
 
-# Setup ACME account.
+# Preform setup i.e. fetching directory and registering ACME account
 cert_issuer.setup()
 
 try:
@@ -61,3 +55,9 @@ except CertApiException as e:
     print(f"An error occurred:", json.dumps(e.json_obj(), indent=2))
 
 ```
+
+
+## Example: Use High Leve API
+
+```
+```

{certapi-0.4.5 → certapi-0.4.7}/src/certapi.egg-info/SOURCES.txt

@@ -41,7 +41,6 @@ src/certapi/issuers/SelfCertIssuer.py
 src/certapi/issuers/__init__.py
 src/certapi/issuers/abstract_certissuer.py
 src/certapi/keystore/FileSystemKeyStore.py
-src/certapi/keystore/FileSystemKeystore.py
 src/certapi/keystore/KeyStore.py
 src/certapi/keystore/PostgresqlKeyStore.py
 src/certapi/keystore/RemoteKeyStore.py

certapi-0.4.5/src/certapi/keystore/FileSystemKeystore.py

@@ -1,102 +0,0 @@
-import os
-from typing import Tuple, Optional, Union, List
-
-from certapi.crypto import certs_from_pem
-from .KeyStore import KeyStore
-from certapi.crypto import Key, Certificate
-
-
-class FileSystemKeyStore(KeyStore):
-    """
-    Important nuance of using filesystem keystores is that id and name means same thing.
-    """
-
-    def __init__(self, base_dir=".", keys_dir_name="keys", certs_dir_name="certs"):
-        self.keys_dir = os.path.join(base_dir, keys_dir_name)
-        self.certs_dir = os.path.join(base_dir, certs_dir_name)
-        os.makedirs(self.keys_dir, exist_ok=True)
-        os.makedirs(self.certs_dir, exist_ok=True)
-
-    def save_key(self, key: Key, name: str | None) -> str:
-        name = str(name)
-        key_path = os.path.join(self.keys_dir, f"{name}.key")
-        with open(key_path, "wb") as f:
-            f.write(key.to_pem())
-        return name
-
-    def find_key_by_id(self, id: str | int) -> Union[None, Key]:
-        name = str(id)
-        key_path = os.path.join(self.keys_dir, f"{name}.key")
-        if os.path.exists(key_path):
-            with open(key_path, "rb") as f:
-                key_data = f.read()
-            try:
-                return Key.from_pem(key_data)
-            except:
-                pass
-        return None
-
-    def find_key_by_name(self, name: str) -> Optional[Key]:
-        return self.find_key_by_id(name)
-
-    def save_cert(
-        self, private_key_id: str, cert: Certificate | str | List[Certificate], domains: list, name: str = None
-    ) -> int:
-        cert_pem = self._get_cert_as_pem_bytes(cert)
-
-        if name:
-            cert_path = os.path.join(self.certs_dir, f"{name}.crt")
-            with open(cert_path, "wb") as f:
-                f.write(cert_pem)
-
-        key_content = None
-        key_path = os.path.join(self.keys_dir, f"{private_key_id}.key")
-        with open(key_path, "rb") as f:
-            key_content = f.read()
-
-        for domain in domains:
-            domain_name = domain
-            if name is not None and name.endswith(".selfsigned"):
-                domain_name += ".selfsigned"
-
-            if domain_name != private_key_id:
-                with open(os.path.join(self.keys_dir, f"{domain_name}.key"), "wb") as f:
-                    f.write(key_content)
-
-            domain_cert_path = os.path.join(self.certs_dir, f"{domain_name}.crt")
-            with open(domain_cert_path, "wb") as f:
-                f.write(cert_pem)
-
-        return name
-
-    def find_key_and_cert_by_domain(self, domain: str) -> None | Tuple[str, Key, List[Certificate]]:
-        return self._get_key_and_cert_by_name(domain)
-
-    def find_key_and_cert_by_cert_id(self, id: str) -> None | Tuple[Key, List[Certificate]]:
-
-        key_path = os.path.join(self.keys_dir, f"{id}.key")
-        cert_path = os.path.join(self.certs_dir, f"{id}.crt")
-        key = None
-        cert = None
-        if os.path.exists(key_path):
-            try:
-                with open(key_path, "rb") as f:
-                    key = Key.from_pem(f.read())
-            except ValueError:
-                pass
-
-        if os.path.exists(cert_path):
-            try:
-                with open(cert_path, "rb") as f:
-                    cert = certs_from_pem(f.read())
-            except ValueError:
-                pass
-
-        if cert is None or key is None:
-            return None
-        return (key, cert)
-
-    def _get_key_and_cert_by_name(self, name: str) -> None | Tuple[str, Key, List[Certificate]]:
-        result = self.find_key_and_cert_by_cert_id(name)
-        if result is not None:
-            return (name, result[0], result[1])