certapi 0.4.7__tar.gz → 0.5.0__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: certapi
-Version: 0.4.7
+Version: 0.5.0
 Summary: Python Package for managing keys, request SSL certificates from ACME.
 Home-page: https://github.com/mesudip/certapi
 Author: Sudip Bhattarai
@@ -18,6 +18,8 @@ This is to be used as a base library for building other tools, or to integrate C
 
 > ⚠️ Warning: This project is in beta. Please stay tuned for the LTS `v1.0.0` release.
 
+For a detailed list of changes, please refer to the [CHANGELOG.md](CHANGELOG.md).
+
 ## Installation
 
 You can install CertApi using pip

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

@@ -5,6 +5,8 @@ This is to be used as a base library for building other tools, or to integrate C
 
 > ⚠️ Warning: This project is in beta. Please stay tuned for the LTS `v1.0.0` release.
 
+For a detailed list of changes, please refer to the [CHANGELOG.md](CHANGELOG.md).
+
 ## Installation
 
 You can install CertApi using pip
@@ -47,4 +49,4 @@ except CertApiException as e:
 ## Example: Use High Leve API
 
 ```
-```
+```

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

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

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

@@ -1,4 +1,4 @@
-from .acme.Acme import Acme, Order, AcmeNetworkError, AcmeHttpError,AcmeError, 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.7 → certapi-0.5.0}/src/certapi/acme/Acme.py

@@ -93,9 +93,9 @@ class Acme:
         return response
 
     def _signed_req(
-        self, url, payload: Union[str, dict, list, bytes, None] = None, depth=0, step="Acme Request", throw=True
+        self, url, req_payload: Union[str, dict, list, bytes, None] = None, depth=0, step="Acme Request", throw=True
     ) -> requests.Response:
-        payload64 = b64_encode(payload) if payload is not None else b""
+        payload64 = b64_encode(req_payload) if req_payload is not None else b""
 
         protected = {
             "url": url,
@@ -118,9 +118,9 @@ 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:
+            if e.can_retry and depth <= 1:
                 time.sleep(2)
-                return self._signed_req(url, payload, depth + 1, step, throw)
+                return self._signed_req(url, req_payload, depth + 1, step, throw)
             else:
                 raise e
 

{certapi-0.4.7 → certapi-0.5.0}/src/certapi/acme/http.py

@@ -1,5 +1,6 @@
 import requests
 from .AcmeError import *
+import json as j
 
 
 def request(method, step: str, url: str, json=None, headers=None, throw=True) -> requests.Response:
@@ -21,6 +22,8 @@ def request(method, step: str, url: str, json=None, headers=None, throw=True) ->
             step,
         )
     if 199 <= res.status_code > 299:
+        if json:
+            print("Request:", j.dumps(json))
         [print(x, y) for (x, y) in res.headers.items()]
         print("Response:", res.text)
         json_data = None

{certapi-0.4.7 → certapi-0.5.0}/src/certapi/challenge_solver/ChallengeSolver.py

@@ -6,7 +6,7 @@ from typing import Literal
 
 class ChallengeSolver(ABC):
     """
-    Abstract base class for a challenge store.
+    Abstract base class for a challenge solver.
     """
 
     @abstractmethod

{certapi-0.4.7 → certapi-0.5.0}/src/certapi/client/cert_manager_client.py

@@ -27,7 +27,7 @@ class CertManagerClient:
     def obtain_certificate(
         self,
         hostnames: Union[str, List[str]],
-        key_type: str = "rsa",
+        key_type: str = "ecdsa",
         expiry_days: int = 90,
         country: Optional[str] = None,
         state: Optional[str] = None,

{certapi-0.4.7 → certapi-0.5.0}/src/certapi/crypto/crypto.py

@@ -181,7 +181,6 @@ def digest_sha256(data: bytes) -> bytes:
 def get_csr_hostnames(csr: x509.CertificateSigningRequest):
 
     domains = []
-
     common_names = [attr.value for attr in csr.subject.get_attributes_for_oid(NameOID.COMMON_NAME)]
     if common_names:
         cn = common_names[0]

{certapi-0.4.7 → certapi-0.5.0}/src/certapi/issuers/AcmeCertIssuer.py

@@ -55,11 +55,12 @@ class AcmeCertIssuer(CertIssuer):
 
         # acme can use our key and immediately allow certificate registration if we have recently proved domain ownership.
         if len(challenges) > 0 and challenge_solver.supported_challenge_type() == "dns-01":
-            print("Waiting 10 seconds for DNS propagation .. ")
-            time.sleep(10)  # sleep 7 seconds for dns propagation
+            print("Waiting 20 seconds for DNS propagation .. ")
+            time.sleep(20)  # sleep 20 seconds for dns propagation
 
         for c in challenges:
             c.verify(challenge_solver.supported_challenge_type())
+
         while len(remaining_now) > 0:
             if time.time() > end and counter > 4:
                 print("Order finalization time out")

{certapi-0.4.7 → certapi-0.5.0}/src/certapi/manager/acme_cert_manager.py

@@ -36,7 +36,7 @@ class AcmeCertManager:
         if not hostnames:
             raise ValueError("CSR does not contain any hostnames.")
 
-        # Find a challenge store that supports all hostnames in the CSR
+        # Find a challenge solver that supports all hostnames in the CSR
         selected_challenge_solver = None
         for store in self.challenge_solvers:
             if all(store.supports_domain(h) for h in hostnames):
@@ -44,7 +44,7 @@ class AcmeCertManager:
                 break
 
         if selected_challenge_solver is None:
-            raise ValueError(f"No challenge store found that supports all domains: {hostnames}")
+            raise ValueError(f"No challenge solver found that supports all domains: {hostnames}")
 
         fullchain_cert = self.cert_issuer.sign_csr(csr, challenge_solver=selected_challenge_solver)
         if fullchain_cert:
@@ -81,7 +81,7 @@ class AcmeCertManager:
         missing = [h for h in hosts if h not in existing]
         if len(missing) > 0:
             issued_certs_list = []
-            # Group missing hosts by the challenge store that supports them
+            # Group missing hosts by the challenge solver that supports them
             domains_by_store: Dict[ChallengeSolver, List[str]] = {}
             for host in missing:
                 found_store = None

{certapi-0.4.7 → certapi-0.5.0}/src/certapi/server/api.py

@@ -38,7 +38,7 @@ def create_api_resources(api_ns, cert_manager: AcmeCertManager):
     obtain_parser.add_argument(
         "hostname", type=str, action="append", required=True, help="List of hostnames for the certificate"
     )
-    obtain_parser.add_argument("key_type", type=str, default="rsa", help="Type of key (rsa or ecdsa)")
+    obtain_parser.add_argument("key_type", type=str, default="ecdsa", help="Type of key (rsa or ecdsa)")
     obtain_parser.add_argument("expiry_days", type=int, default=90, help="Number of days until certificate expiry")
     obtain_parser.add_argument("country", type=str, help="Country name")
     obtain_parser.add_argument("state", type=str, help="State or province name")

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: certapi
-Version: 0.4.7
+Version: 0.5.0
 Summary: Python Package for managing keys, request SSL certificates from ACME.
 Home-page: https://github.com/mesudip/certapi
 Author: Sudip Bhattarai
@@ -18,6 +18,8 @@ This is to be used as a base library for building other tools, or to integrate C
 
 > ⚠️ Warning: This project is in beta. Please stay tuned for the LTS `v1.0.0` release.
 
+For a detailed list of changes, please refer to the [CHANGELOG.md](CHANGELOG.md).
+
 ## Installation
 
 You can install CertApi using pip