certapi 0.2.0__tar.gz → 0.2.2__tar.gz

{certapi-0.2.0 → certapi-0.2.2}/PKG-INFO

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

{certapi-0.2.0 → certapi-0.2.2}/setup.py

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

{certapi-0.2.0 → certapi-0.2.2}/src/certapi/certauthority.py

@@ -30,11 +30,13 @@ class CertAuthority:
         key_store: KeyStore,
         acme_url=None,
         dns_stores: List[challenge.ChallengeStore] = None,
+        self_verify_challenge=False,
     ):
         self.acme = Acme(key_store.account_key, url=acme_url)
         self.key_store = key_store
         self.challengesStore: challenge.ChallengeStore = challenge_store
         self.dns_stores = dns_stores if dns_stores is not None else []
+        self.self_verify_challenge = self_verify_challenge
 
     def setup(self):
         self.acme.setup()
@@ -93,7 +95,8 @@ class CertAuthority:
                 time.sleep(10)
 
             for c in challenges:
-                # c.self_verify()
+                if self.self_verify_challenge and not has_wildcard:
+                    c.self_verify()
                 c.verify(dns=has_wildcard)
             end = time.time() + 60  # Increase overall timeout
             source: List[Challenge] = [x for x in challenges]

{certapi-0.2.0 → certapi-0.2.2}/src/certapi/db.py

@@ -141,9 +141,9 @@ class SqliteKeyStore(KeyStore):
 
 
 class FilesystemKeyStore(KeyStore):
-    def __init__(self, base_dir="."):
-        self.keys_dir = os.path.join(base_dir, "keys")
-        self.certs_dir = os.path.join(base_dir, "certs")
+    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)
         self._init_account_key()
@@ -191,7 +191,11 @@ class FilesystemKeyStore(KeyStore):
         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:
+            if name is not None and name.endswith(".selfsigned"):
+                domain = domain + ".selfsigned"
+
             if domain != private_key_id:
                 with open(os.path.join(self.keys_dir, f"{domain}.key"), "wb") as f:
                     f.write(key_content)

{certapi-0.2.0 → certapi-0.2.2}/src/certapi.egg-info/PKG-INFO

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