certapi 0.2.1__tar.gz → 0.2.3__tar.gz

{certapi-0.2.1 → certapi-0.2.3}/PKG-INFO

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

{certapi-0.2.1 → certapi-0.2.3}/setup.py

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

{certapi-0.2.1 → certapi-0.2.3}/src/certapi/Acme.py

@@ -1,6 +1,7 @@
 import os
 import re
 import threading
+import time
 from typing import Union, List, Tuple
 import json
 from cryptography.hazmat.primitives.asymmetric.ec import EllipticCurvePrivateKey
@@ -81,7 +82,6 @@ class AcmeHttpError(AcmeError, requests.HTTPError):
                             "resolved": validation_record["addressesResolved"],
                             "used": validation_record["addressUsed"],
                         }
-                        err_detail: str = error["detail"]
                         if error["type"] == "urn:ietf:params:acme:error:connection":
                             if "Timeout during connect" in err_detail:
                                 error["connect"] = {"error": "Timeout"}
@@ -276,6 +276,7 @@ class Acme:
             response = post(step, url, json=payload, headers={"Content-Type": "application/jose+json"}, throw=throw)
         except AcmeError as e:
             if e.can_retry and depth <= 0:
+                time.sleep(2)
                 return self._signed_req(url, payload, depth + 1, step, throw)
             else:
                 raise e

{certapi-0.2.1 → certapi-0.2.3}/src/certapi/cloudflare_challenge_store.py

@@ -7,7 +7,7 @@ from certapi.cloudflare_client import Cloudflare
 class CloudflareChallengeStore(ChallengeStore):
     def __init__(self):
         self.cloudflare = Cloudflare()
-        self.challenges_map = {}  # Stores key: record_id (still needed for deletion)
+        self.challenges_map = {}  # Stores key: record_id (needed for deletion)
 
     def has_domain(self, domain: str) -> bool:
         """

{certapi-0.2.1 → certapi-0.2.3}/src/certapi/db.py

@@ -191,8 +191,9 @@ 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.endswith(".selfsigned"):
+            if name is not None and name.endswith(".selfsigned"):
                 domain = domain + ".selfsigned"
 
             if domain != private_key_id:

certapi-0.2.3/src/certapi/digitalocean_challenge_store.py

@@ -0,0 +1,57 @@
+import os
+from collections.abc import MutableMapping
+from certapi.challenge import ChallengeStore
+from certapi.digitalocean_client import DigitalOcean
+
+
+class DigitalOceanChallengeStore(ChallengeStore):
+    def __init__(self):
+        self.digitalocean = DigitalOcean()
+        self.challenges_map = {}  # Stores key: record_id (needed for deletion)
+
+    def has_domain(self, domain: str) -> bool:
+        """
+        Checks if the DigitalOcean account has access to the given domain (or its base domain)
+        as a registered zone.
+        """
+        try:
+            self.digitalocean.determine_domain(domain)
+            return True
+        except Exception:
+            return False
+
+    def save_challenge(self, key: str, value: str, domain=None):
+        # key example: _acme-challenge.sub.example.com
+        # value example: ACME_CHALLENGE_TOKEN
+        base_domain = self.digitalocean.determine_domain(domain)
+
+        record_id = self.digitalocean.create_record(name=key, data=value, domain=base_domain)
+        self.challenges_map[key] = record_id
+        print(f"DigitalOceanChallengeStore: Saved challenge for {key} with record ID {record_id}")
+
+    def get_challenge(self, key: str, domain: str) -> str:
+        base_domain = self.digitalocean.determine_domain(domain)
+        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 None  # Return None if not found, as per ChallengeStore's __getitem__ behavior
+
+    def delete_challenge(self, key: str, domain: str):
+        if key not in self.challenges_map:
+            raise KeyError(f"Challenge {key} not found in store (no record_id stored).")
+
+        record_id = self.challenges_map[key]
+        base_domain = self.digitalocean.determine_domain(domain)
+        self.digitalocean.delete_record(record=record_id, domain=base_domain)
+        del self.challenges_map[key]
+        print(f"DigitalOceanChallengeStore: Deleted challenge for {key} with record ID {record_id}")
+
+    def __iter__(self):
+        # This is tricky as we can't easily iterate all challenges across all domains
+        # If the user wants a full API-driven iteration, they need to clarify how to get all domains.
+        return iter(self.challenges_map)
+
+    def __len__(self):
+        # Similar to __iter__, this will count challenges managed by this store instance.
+        return len(self.challenges_map)

certapi-0.2.3/src/certapi/digitalocean_client.py

@@ -0,0 +1,86 @@
+import json
+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
+        self.api = "https://api.digitalocean.com/v2/domains"
+        if not self.token:
+            self.token = getenv("DIGITALOCEAN_API_TOKEN")
+            if not self.token:
+                raise Exception("API_TOKEN not found in environment")
+
+    def determine_domain(self, domain):
+        """Determine registered domain in API"""
+        request_headers = {"Content-Type": "application/json", "Authorization": "Bearer {0}".format(self.token)}
+        response = urlopen(Request(self.api, headers=request_headers))
+        if response.getcode() != 200:
+            raise Exception(json.loads(response.read().decode("utf8")))
+        domains = json.loads(response.read().decode("utf8"))["domains"]
+        for d in domains:
+            if d["name"] in domain:
+                return d["name"]
+
+    def create_record(self, name, data, domain):
+        """
+        Create DNS record
+        Params:
+            name, string, record name
+            data, string, record data
+            domain, string, dns domain
+        Return:
+            record_id, int, created record id
+        """
+        registered_domain = self.determine_domain(domain)
+        api = self.api + "/" + registered_domain + "/records"
+        request_headers = {"Content-Type": "application/json", "Authorization": "Bearer {0}".format(self.token)}
+        request_data = {"type": "TXT", "ttl": 300, "name": name, "data": data}
+        response = urlopen(Request(api, data=json.dumps(request_data).encode("utf8"), headers=request_headers))
+        if response.getcode() != 201:
+            raise Exception(json.loads(response.read().decode("utf8")))
+        return json.loads(response.read().decode("utf8"))["domain_record"]["id"]
+
+    def delete_record(self, record, domain):
+        """
+        Delete DNS record
+        Params:
+            record, int, record id number
+            domain, string, dns domain
+        """
+        registered_domain = self.determine_domain(domain)
+        api = self.api + "/" + registered_domain + "/records/" + str(record)
+        request_headers = {"Content-Type": "application/json", "Authorization": "Bearer {0}".format(self.token)}
+        request = Request(api, data=json.dumps({}).encode("utf8"), headers=request_headers)
+        request.get_method = lambda: "DELETE"
+        response = urlopen(request)
+        if response.getcode() != 204:
+            raise Exception(json.loads(response.read().decode("utf8")))
+
+    def list_records(self, domain, name_filter=None):
+        """
+        List DNS records for a domain, optionally filtered by name.
+        Params:
+            domain, string, dns domain
+            name_filter, string, optional filter for record name
+        Return:
+            records, list of dicts, matching DNS records
+        """
+        registered_domain = self.determine_domain(domain)
+        api = self.api + "/" + registered_domain + "/records"
+        request_headers = {"Content-Type": "application/json", "Authorization": "Bearer {0}".format(self.token)}
+        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.1 → certapi-0.2.3}/src/certapi.egg-info/PKG-INFO

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

{certapi-0.2.1 → certapi-0.2.3}/src/certapi.egg-info/SOURCES.txt

@@ -12,6 +12,8 @@ src/certapi/crypto.py
 src/certapi/crypto_classes.py
 src/certapi/custom_certauthority.py
 src/certapi/db.py
+src/certapi/digitalocean_challenge_store.py
+src/certapi/digitalocean_client.py
 src/certapi/util.py
 src/certapi.egg-info/PKG-INFO
 src/certapi.egg-info/SOURCES.txt