certapi 0.5.1__tar.gz → 1.0.0__tar.gz

{certapi-0.5.1/src/certapi.egg-info → certapi-1.0.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: certapi
-Version: 0.5.1
+Version: 1.0.0
 Summary: Python Package for managing keys, request SSL certificates from ACME.
 Home-page: https://github.com/mesudip/certapi
 Author: Sudip Bhattarai
@@ -27,7 +27,10 @@ Dynamic: summary
 CertApi is a Python package for requesting SSL certificates from ACME.
 This is to be used as a base library for building other tools, or to integrate Certificate creation feature in you app.
 
-> ⚠️ Warning: This project is in beta. Please stay tuned for the LTS `v1.0.0` release.
+[![Build Status](https://github.com/mesudip/certapi/actions/workflows/tests.yml/badge.svg?branch=master)](https://github.com/mesudip/certapi/actions/workflows/tests.yml)
+[![codecov](https://codecov.io/github/mesudip/certapi/graph/badge.svg?token=NYTNCH29IT)](https://codecov.io/github/mesudip/certapi)
+[![PyPI version](https://img.shields.io/pypi/v/certapi.svg)](https://pypi.org/project/certapi/)
+
 
 For a detailed list of changes, please refer to the [CHANGELOG.md](CHANGELOG.md).
 
@@ -39,7 +42,7 @@ You can install CertApi using pip
 pip install certapi
 ```
 
-## Example: Obtain Certificate with Cloudflare
+## Example: Low Leve API : Certificate with Cloudflare
 
 ```python
 import json
@@ -51,7 +54,7 @@ from certapi import CertApiException, CloudflareChallengeSolver, Key, AcmeCertIs
 challenge_solver = CloudflareChallengeSolver(api_key=None)
 
 ## initialize cert issuer with a new account key
-cert_issuer = AcmeCertIssuer(Key.generate('rsa'), challenge_solver)
+cert_issuer = AcmeCertIssuer(Key.generate('ecdsa'), challenge_solver)
 
 # Preform setup i.e. fetching directory and registering ACME account
 cert_issuer.setup()
@@ -70,7 +73,45 @@ except CertApiException as e:
 ```
 
 
-## Example: Use High Leve API
+## Example: High Level API (with AcmeCertManager)
 
-```
+The `AcmeCertManager` provides a high-level interface that handles certificate storage, automatic renewal checks, and multi-solver management.
+
+```python
+from certapi import (
+    AcmeCertManager, 
+    FileSystemKeyStore, 
+    AcmeCertIssuer, 
+    CloudflareChallengeSolver
+)
+
+# 1. Setup KeyStore to persist keys and certificates
+key_store = FileSystemKeyStore("db")
+
+
+# DNS-01 via Cloudflare (e.g. for wildcard certs or internal domains)
+dns_solver = CloudflareChallengeSolver(api_token="your-cloudflare-token")
+
+# 3. Initialize and Setup AcmeCertManager
+# Create cert issuer with the default challenge solver
+cert_issuer = AcmeCertIssuer.with_keystore(key_store, dns_solver)
+
+cert_manager = AcmeCertManager(
+    key_store=key_store,
+    cert_issuer=cert_issuer,
+    challenge_solvers=[dns_solver], # other solvers can be used
+    renew_threshold_days=7
+)
+cert_manager.setup()
+
+# 4. Issue or Reuse Certificate
+# Automatically checks keystore and renews only if necessary
+response = cert_manager.issue_certificate(["example.com", "www.example.com"])
+
+for cert_data in response.issued:
+    print(f"Newly issued for: {cert_data.domains}")
+    print(cert_data.cert)
+
+for cert_data in response.existing:
+    print(f"Reusing existing for: {cert_data.domains}")
 ```

certapi-1.0.0/README.md

@@ -0,0 +1,93 @@
+# CertApi
+
+CertApi is a Python package for requesting SSL certificates from ACME.
+This is to be used as a base library for building other tools, or to integrate Certificate creation feature in you app.
+
+[![Build Status](https://github.com/mesudip/certapi/actions/workflows/tests.yml/badge.svg?branch=master)](https://github.com/mesudip/certapi/actions/workflows/tests.yml)
+[![codecov](https://codecov.io/github/mesudip/certapi/graph/badge.svg?token=NYTNCH29IT)](https://codecov.io/github/mesudip/certapi)
+[![PyPI version](https://img.shields.io/pypi/v/certapi.svg)](https://pypi.org/project/certapi/)
+
+
+For a detailed list of changes, please refer to the [CHANGELOG.md](CHANGELOG.md).
+
+## Installation
+
+You can install CertApi using pip
+
+```bash
+pip install certapi
+```
+
+## Example: Low Leve API : Certificate with Cloudflare
+
+```python
+import json
+from certapi import CertApiException, CloudflareChallengeSolver, Key, AcmeCertIssuer
+
+
+# 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 with a new account key
+cert_issuer = AcmeCertIssuer(Key.generate('ecdsa'), challenge_solver)
+
+# Preform setup i.e. fetching directory and registering ACME account
+cert_issuer.setup()
+
+try:
+    # Obtain a certificate for your domain
+    (key, cert) = cert_issuer.generate_key_and_cert_for_domain("your-domain.com")
+
+    print("------ Private Key -----")
+    print(key.to_pem())
+    print("------- Certificate ------")
+    print(cert)
+except CertApiException as e:
+    print(f"An error occurred:", json.dumps(e.json_obj(), indent=2))
+
+```
+
+
+## Example: High Level API (with AcmeCertManager)
+
+The `AcmeCertManager` provides a high-level interface that handles certificate storage, automatic renewal checks, and multi-solver management.
+
+```python
+from certapi import (
+    AcmeCertManager, 
+    FileSystemKeyStore, 
+    AcmeCertIssuer, 
+    CloudflareChallengeSolver
+)
+
+# 1. Setup KeyStore to persist keys and certificates
+key_store = FileSystemKeyStore("db")
+
+
+# DNS-01 via Cloudflare (e.g. for wildcard certs or internal domains)
+dns_solver = CloudflareChallengeSolver(api_token="your-cloudflare-token")
+
+# 3. Initialize and Setup AcmeCertManager
+# Create cert issuer with the default challenge solver
+cert_issuer = AcmeCertIssuer.with_keystore(key_store, dns_solver)
+
+cert_manager = AcmeCertManager(
+    key_store=key_store,
+    cert_issuer=cert_issuer,
+    challenge_solvers=[dns_solver], # other solvers can be used
+    renew_threshold_days=7
+)
+cert_manager.setup()
+
+# 4. Issue or Reuse Certificate
+# Automatically checks keystore and renews only if necessary
+response = cert_manager.issue_certificate(["example.com", "www.example.com"])
+
+for cert_data in response.issued:
+    print(f"Newly issued for: {cert_data.domains}")
+    print(cert_data.cert)
+
+for cert_data in response.existing:
+    print(f"Reusing existing for: {cert_data.domains}")
+```

{certapi-0.5.1 → certapi-1.0.0}/pyproject.toml

@@ -9,7 +9,6 @@ testpaths = [
 ]
 env_files =[".env", ".test.env"]
 pythonpath = "src"
-timeout = 10
 
 [build-system]
 requires = ["setuptools>=42"]

{certapi-0.5.1 → certapi-1.0.0}/setup.py

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

{certapi-0.5.1 → certapi-1.0.0}/src/certapi/acme/AcmeError.py

@@ -61,30 +61,36 @@ class AcmeHttpError(AcmeError, requests.HTTPError):
                             message = err_detail
                     else:
                         validation_record = validation_record[0]
-                        error["hostname"] = validation_record["hostname"]
+                        error["hostname"] = validation_record.get("hostname", "unknown")
                         error["dns"] = {
-                            "resolved": validation_record["addressesResolved"],
-                            "used": validation_record["addressUsed"],
+                            "resolved": validation_record.get("addressesResolved"),
+                            "used": validation_record.get("addressUsed"),
                         }
                         if err_type == "urn:ietf:params:acme:error:connection":
                             if "Timeout during connect" in err_detail:
                                 error["connect"] = {"error": "Timeout"}
+                                address_used = validation_record.get("addressUsed", "unknown")
+                                port = str(validation_record.get("port", "unknown"))
+                                hostname = error.get("hostname", "unknown")
                                 message = (
-                                    error["hostname"]
+                                    str(hostname)
                                     + "["
-                                    + validation_record["addressUsed"]
+                                    + address_used
                                     + ":"
-                                    + validation_record["port"]
+                                    + port
                                     + "] Connect Timeout (Maybe firewall reasons)"
                                 )
                             elif err_detail.endswith("Connection refused"):
                                 error["connect"] = {"error": "connection refused"}
+                                address_used = validation_record.get("addressUsed", "unknown")
+                                port = str(validation_record.get("port", "unknown"))
+                                hostname = error.get("hostname", "unknown")
                                 message = (
-                                    error["hostname"]
+                                    str(hostname)
                                     + "["
-                                    + validation_record["addressUsed"]
+                                    + address_used
                                     + ":"
-                                    + validation_record["port"]
+                                    + port
                                     + "] Connection Refused (Is http server running?)"
                                 )
                             elif err_detail:
@@ -98,12 +104,11 @@ class AcmeHttpError(AcmeError, requests.HTTPError):
 
                             if match:
                                 error["response"] = (match.group(1) if match is not None else err_detail,)
-                                error["status_code"] = (error["status"],)
+                                error["status_code"] = (error.get("status"),)
+                                hostname = error.get("hostname", "unknown")
+                                status = error.get("status", "unknown")
                                 message = (
-                                    error["hostname"]
-                                    + " Status="
-                                    + error["status"]
-                                    + ": Invalid response in challenge url"
+                                    str(hostname) + " Status=" + str(status) + ": Invalid response in challenge url"
                                 )
                             else:
                                 message = err_detail
@@ -131,7 +136,8 @@ class AcmeInvaliOrderError(AcmeHttpError):
         super().__init__(response, step)
 
 
-class AcmeInvaliNonceError(AcmeHttpError):
+class AcmeInvalidNonceError(AcmeHttpError):
     def __init__(self, response: requests.Response, step: str):
         super().__init__(response, step)
         self.can_retry = True
+        self.response = 0

{certapi-0.5.1 → certapi-1.0.0}/src/certapi/acme/http.py

@@ -34,7 +34,7 @@ def request(method, step: str, url: str, json=None, headers=None, throw=True) ->
         if json_data and json_data.get("type"):
             errorType = json_data["type"]
             if errorType == "urn:ietf:params:acme:error:badNonce":
-                raise AcmeInvaliNonceError(res, step=step)
+                raise AcmeInvalidNonceError(res, step=step)
 
         if throw:
             raise AcmeHttpError(res, step=step)

{certapi-0.5.1 → certapi-1.0.0}/src/certapi/errors.py

@@ -12,6 +12,7 @@ class CertApiException(Exception):
         self.detail = detail if detail is not None else {}
         self.step = step
         self.can_retry = False
+        self.retry_delay = 4  # Default retry delay in seconds
 
     def json_obj(self) -> dict:
         return {"name": self.__class__.__name__, "message": self.message, "step": self.step, "detail": self.detail}

{certapi-0.5.1 → certapi-1.0.0}/src/certapi/http/HttpClientBase.py

@@ -24,7 +24,7 @@ class HttpClientBase(object):
         try:
             res = self.session.request(method, url, json=json_data, data=data, params=params, timeout=timeout)
         except requests.exceptions.ConnectionError as e:
-            print("Request [" + str(res.status_code) + "] : " + method + " " + url + " step=" + str(step))
+            print("Request [Connection Error] : " + method + " " + url + " step=" + str(step))
             raise NetworkError(
                 request=e.request,
                 message=f"Network connection error: {e}",
@@ -32,7 +32,7 @@ class HttpClientBase(object):
                 step=f"HTTP Request ({method} {url})" if step is None else step,
             ) from e
         except requests.exceptions.Timeout as e:
-            print("Request [" + str(res.status_code) + "] : " + method + " " + url + " step=" + str(step))
+            print("Request [Timeout] : " + method + " " + url + " step=" + str(step))
             raise NetworkError(
                 request=e.request,
                 message=f"Request timed out: {e}",
@@ -40,7 +40,7 @@ class HttpClientBase(object):
                 step=f"HTTP Request ({method} {url})" if step is None else step,
             ) from e
         except requests.exceptions.RequestException as e:
-            print("Request [" + str(res.status_code) + "] : " + method + " " + url + " step=" + str(step))
+            print("Request [Request Exception] : " + method + " " + url + " step=" + str(step))
             raise NetworkError(
                 request=e.request,
                 message=f"An unexpected network error occurred: {e}",
@@ -80,8 +80,9 @@ class HttpClientBase(object):
                 return self._req(method, url, step, json_data, data, params, timeout)
             except CertApiException as e:
                 if e.can_retry and i < retries:
-                    print(f"Retrying {method} {url} in {delay} seconds due to retryable error: {e.message}")
-                    time.sleep(delay)
+                    retry_delay = e.retry_delay if hasattr(e, "retry_delay") else delay
+                    print(f"Retrying {method} {url} in {retry_delay} seconds due to retryable error: {e.message}")
+                    time.sleep(retry_delay)
                 else:
                     e.can_retry = False
                     raise

{certapi-0.5.1 → certapi-1.0.0}/src/certapi/issuers/AcmeCertIssuer.py

@@ -21,6 +21,16 @@ class AcmeCertIssuer(CertIssuer):
         self.challenge_solver = challenge_solver
         self.self_verify_challenge = self_verify_challenge
 
+    @staticmethod
+    def with_keystore(
+        key_store: "KeyStore",
+        challenge_solver: ChallengeSolver,
+        account_key_name: str = "acme_account.key",
+        acme_url: str = None,
+    ) -> "AcmeCertIssuer":
+        account_key, _ = key_store._get_or_generate_key(account_key_name)
+        return AcmeCertIssuer(account_key, challenge_solver, acme_url=acme_url)
+
     def setup(self):
         self.acme.setup()
         res: Response = self.acme.register()

{certapi-0.5.1 → certapi-1.0.0}/src/certapi/manager/acme_cert_manager.py

@@ -12,6 +12,8 @@ from ..keystore.KeyStore import KeyStore
 from cryptography.x509 import Certificate, CertificateSigningRequest
 from ..crypto import Key, certs_to_pem, cert_to_pem, get_csr_hostnames
 
+DEFAULT_RENEW_THRESHOLD_DAYS = 62
+
 
 class AcmeCertManager:
     def __init__(
@@ -19,10 +21,14 @@ class AcmeCertManager:
         key_store: KeyStore,
         cert_issuer: AcmeCertIssuer,
         challenge_solvers: List[ChallengeSolver] = [],
+        renew_threshold_days: int = DEFAULT_RENEW_THRESHOLD_DAYS,  # Renewal will be accepted if cert is valid for less than 75 days
     ):
         self.key_store: KeyStore = key_store
         self.cert_issuer: AcmeCertIssuer = cert_issuer
         self.challenge_solvers: List[ChallengeSolver] = challenge_solvers
+        self.renew_threshold_days: int = (
+            DEFAULT_RENEW_THRESHOLD_DAYS if renew_threshold_days is None else renew_threshold_days
+        )
 
     def setup(self):
         names = [solver.__class__.__name__.replace("ChallengeSolver", "") for solver in self.challenge_solvers]
@@ -67,6 +73,7 @@ class AcmeCertManager:
         locality: Optional[str] = None,
         organization: Optional[str] = None,
         user_id: Optional[str] = None,
+        renew_threshold_days: Optional[int] = None,
     ) -> CertificateResponse:
 
         if type(hosts) == str:
@@ -77,10 +84,11 @@ class AcmeCertManager:
             result = self.key_store.find_key_and_cert_by_domain(h)
             if result is not None:
                 # result is (domain_id, key, cert_list)
-                cert=result[2][0]
+                cert = result[2][0]
                 invalid_date = cert.not_valid_after_utc
-                # Check if the certificate is still valid for at least 30 days
-                if invalid_date > datetime.now(timezone.utc) + timedelta(days=6):
+                # Check if the certificate is still valid for at least renew_threshold_days
+                threshold = renew_threshold_days if renew_threshold_days is not None else self.renew_threshold_days
+                if invalid_date > datetime.now(timezone.utc) + timedelta(days=threshold):
                     existing[h] = result
         missing = [h for h in hosts if h not in existing]
         if len(missing) > 0:

{certapi-0.5.1 → certapi-1.0.0}/src/certapi/server/api.py

@@ -1,4 +1,6 @@
 import json
+import threading
+import os
 from flask import request, jsonify
 from cryptography.x509 import CertificateSigningRequest
 from flask_restx import Resource, reqparse, fields
@@ -6,7 +8,48 @@ from flask_restx import Resource, reqparse, fields
 from certapi import AcmeCertManager
 
 
-def create_api_resources(api_ns, cert_manager: AcmeCertManager):
+class RenewalQueueFullError(Exception):
+    """Exception raised when the renewal queue is full."""
+
+    pass
+
+
+class RenewalLockManager:
+    def __init__(self, queue_size: int = 5):
+        self.queue_size = queue_size
+        self._lock = threading.Lock()
+        self._condition = threading.Condition(self._lock)
+        self._renewing_domains = set()
+        self._waiting_threads = 0
+
+    def acquire(self, domains):
+        while True:
+            with self._lock:
+                # Check if any domain is already being renewed by another thread
+                if any(h in self._renewing_domains for h in domains):
+                    if self._waiting_threads >= self.queue_size:
+                        raise RenewalQueueFullError("Proper queue is full")
+
+                    self._waiting_threads += 1
+                    self._condition.wait()
+                    self._waiting_threads -= 1
+                    continue  # Re-check everything after waking up
+
+                # Mark as renewing
+                for h in domains:
+                    self._renewing_domains.add(h)
+                break
+
+    def release(self, domains):
+        with self._lock:
+            for h in domains:
+                self._renewing_domains.discard(h)
+            self._condition.notify_all()
+
+
+def create_api_resources(api_ns, cert_manager: AcmeCertManager, renew_queue_size: int = 5):
+
+    lock_manager = RenewalLockManager(queue_size=renew_queue_size)
 
     # Models for documentation
     issued_cert_model = api_ns.model(
@@ -45,6 +88,7 @@ def create_api_resources(api_ns, cert_manager: AcmeCertManager):
     obtain_parser.add_argument("locality", type=str, help="Locality name")
     obtain_parser.add_argument("organization", type=str, help="Organization name")
     obtain_parser.add_argument("user_id", type=str, help="User ID")
+    obtain_parser.add_argument("renew_threshold_days", type=int, help="Threshold in days for certificate reuse")
 
     @api_ns.route("/obtain")
     class ObtainCert(Resource):
@@ -59,16 +103,23 @@ def create_api_resources(api_ns, cert_manager: AcmeCertManager):
             args = obtain_parser.parse_args()
             hostnames = args["hostname"]
 
-            data = cert_manager.issue_certificate(
-                hostnames,
-                key_type=args["key_type"],
-                expiry_days=args["expiry_days"],
-                country=args["country"],
-                state=args["state"],
-                locality=args["locality"],
-                organization=args["organization"],
-                user_id=args["user_id"],
-            )
+            # Acquire lock for the domains
+            lock_manager.acquire(hostnames)
+            try:
+                data = cert_manager.issue_certificate(
+                    hostnames,
+                    key_type=args["key_type"],
+                    expiry_days=args["expiry_days"],
+                    country=args["country"],
+                    state=args["state"],
+                    locality=args["locality"],
+                    organization=args["organization"],
+                    user_id=args["user_id"],
+                    renew_threshold_days=args.get("renew_threshold_days"),
+                )
+            finally:
+                lock_manager.release(hostnames)
+
             print(data)
             print(data.to_json())
             if data:

{certapi-0.5.1 → certapi-1.0.0/src/certapi.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: certapi
-Version: 0.5.1
+Version: 1.0.0
 Summary: Python Package for managing keys, request SSL certificates from ACME.
 Home-page: https://github.com/mesudip/certapi
 Author: Sudip Bhattarai
@@ -27,7 +27,10 @@ Dynamic: summary
 CertApi is a Python package for requesting SSL certificates from ACME.
 This is to be used as a base library for building other tools, or to integrate Certificate creation feature in you app.
 
-> ⚠️ Warning: This project is in beta. Please stay tuned for the LTS `v1.0.0` release.
+[![Build Status](https://github.com/mesudip/certapi/actions/workflows/tests.yml/badge.svg?branch=master)](https://github.com/mesudip/certapi/actions/workflows/tests.yml)
+[![codecov](https://codecov.io/github/mesudip/certapi/graph/badge.svg?token=NYTNCH29IT)](https://codecov.io/github/mesudip/certapi)
+[![PyPI version](https://img.shields.io/pypi/v/certapi.svg)](https://pypi.org/project/certapi/)
+
 
 For a detailed list of changes, please refer to the [CHANGELOG.md](CHANGELOG.md).
 
@@ -39,7 +42,7 @@ You can install CertApi using pip
 pip install certapi
 ```
 
-## Example: Obtain Certificate with Cloudflare
+## Example: Low Leve API : Certificate with Cloudflare
 
 ```python
 import json
@@ -51,7 +54,7 @@ from certapi import CertApiException, CloudflareChallengeSolver, Key, AcmeCertIs
 challenge_solver = CloudflareChallengeSolver(api_key=None)
 
 ## initialize cert issuer with a new account key
-cert_issuer = AcmeCertIssuer(Key.generate('rsa'), challenge_solver)
+cert_issuer = AcmeCertIssuer(Key.generate('ecdsa'), challenge_solver)
 
 # Preform setup i.e. fetching directory and registering ACME account
 cert_issuer.setup()
@@ -70,7 +73,45 @@ except CertApiException as e:
 ```
 
 
-## Example: Use High Leve API
+## Example: High Level API (with AcmeCertManager)
 
-```
+The `AcmeCertManager` provides a high-level interface that handles certificate storage, automatic renewal checks, and multi-solver management.
+
+```python
+from certapi import (
+    AcmeCertManager, 
+    FileSystemKeyStore, 
+    AcmeCertIssuer, 
+    CloudflareChallengeSolver
+)
+
+# 1. Setup KeyStore to persist keys and certificates
+key_store = FileSystemKeyStore("db")
+
+
+# DNS-01 via Cloudflare (e.g. for wildcard certs or internal domains)
+dns_solver = CloudflareChallengeSolver(api_token="your-cloudflare-token")
+
+# 3. Initialize and Setup AcmeCertManager
+# Create cert issuer with the default challenge solver
+cert_issuer = AcmeCertIssuer.with_keystore(key_store, dns_solver)
+
+cert_manager = AcmeCertManager(
+    key_store=key_store,
+    cert_issuer=cert_issuer,
+    challenge_solvers=[dns_solver], # other solvers can be used
+    renew_threshold_days=7
+)
+cert_manager.setup()
+
+# 4. Issue or Reuse Certificate
+# Automatically checks keystore and renews only if necessary
+response = cert_manager.issue_certificate(["example.com", "www.example.com"])
+
+for cert_data in response.issued:
+    print(f"Newly issued for: {cert_data.domains}")
+    print(cert_data.cert)
+
+for cert_data in response.existing:
+    print(f"Reusing existing for: {cert_data.domains}")
 ```

{certapi-0.5.1 → certapi-1.0.0}/src/certapi.egg-info/SOURCES.txt

@@ -54,4 +54,5 @@ src/certapi/server/cert_api.py
 src/certapi/server/key_api.py
 tests/test_cert_issuer_generic.py
 tests/test_certs_with_key_types.py
+tests/test_http_error_handling.py
 tests/test_keystores.py

{certapi-0.5.1 → certapi-1.0.0}/tests/test_cert_issuer_generic.py

@@ -1,5 +1,5 @@
 import pytest
-from datetime import datetime, timedelta, timezone
+from datetime import UTC, datetime, timedelta, timezone
 from cryptography import x509
 from cryptography.x509.oid import NameOID, ExtensionOID
 from certapi import Key, SelfCertIssuer, Certificate, CertificateSigningRequest, CertificateSigningRequestBuilder
@@ -58,10 +58,10 @@ def test_generate_key_and_cert(self_cert_issuer_instance: SelfCertIssuer, key_ty
     assert set(san_values) == set(unique_expected_sans)
 
     # Verify expiry
-    now_utc = datetime.now(timezone.utc)
+    now_utc = datetime.now(UTC)
     # Ensure certificate validity dates are timezone-aware UTC for comparison
-    cert_not_valid_before_utc = cert.not_valid_before.astimezone(timezone.utc)
-    cert_not_valid_after_utc = cert.not_valid_after.astimezone(timezone.utc)
+    cert_not_valid_before_utc = cert.not_valid_before_utc.astimezone(timezone.utc)
+    cert_not_valid_after_utc = cert.not_valid_after_utc.astimezone(timezone.utc)
 
     assert cert_not_valid_before_utc <= now_utc
     assert cert_not_valid_after_utc >= now_utc + timedelta(days=expiry_days - 1)  # Allow for slight time difference

certapi-1.0.0/tests/test_http_error_handling.py

@@ -0,0 +1,130 @@
+import pytest
+from unittest.mock import Mock, patch
+import requests
+from certapi.http.HttpClientBase import HttpClientBase
+from certapi.errors import NetworkError, CertApiException
+
+
+class TestHttpErrorHandling:
+    """Test suite for HTTP error handling in HttpClientBase"""
+
+    @pytest.fixture
+    def http_client(self):
+        """Create a basic HttpClientBase instance for testing"""
+        return HttpClientBase(
+            base_url="https://example.com", headers={"Content-Type": "application/json"}, auto_retry=True
+        )
+
+    def test_connection_reset_error_handling(self, http_client):
+        """Test that ConnectionResetError is properly caught and converted to NetworkError"""
+        with patch.object(http_client.session, "request") as mock_request:
+            # Simulate a ConnectionResetError wrapped in requests.exceptions.ConnectionError
+            connection_reset = ConnectionResetError(104, "Connection reset by peer")
+            mock_request.side_effect = requests.exceptions.ConnectionError(connection_reset)
+
+            with pytest.raises(NetworkError) as exc_info:
+                http_client._req("GET", "https://example.com/test", "Test Step")
+
+            # Verify the NetworkError is properly created
+            error = exc_info.value
+            assert error.can_retry is True
+            assert "Network connection error" in error.message
+            assert error.detail["errorType"] == "ConnectionError"
+
+    def test_connection_error_is_retriable(self, http_client):
+        """Test that connection errors are marked as retriable"""
+        with patch.object(http_client.session, "request") as mock_request:
+            mock_request.side_effect = requests.exceptions.ConnectionError("Connection failed")
+
+            with pytest.raises(NetworkError) as exc_info:
+                http_client._req("GET", "https://example.com/test", "Test Step")
+
+            error = exc_info.value
+            assert error.can_retry is True
+            assert hasattr(error, "retry_delay")
+            assert error.retry_delay == 4  # Default retry delay
+
+    def test_timeout_error_is_retriable(self, http_client):
+        """Test that timeout errors are marked as retriable"""
+        with patch.object(http_client.session, "request") as mock_request:
+            mock_request.side_effect = requests.exceptions.Timeout("Request timed out")
+
+            with pytest.raises(NetworkError) as exc_info:
+                http_client._req("GET", "https://example.com/test", "Test Step")
+
+            error = exc_info.value
+            assert error.can_retry is True
+            assert hasattr(error, "retry_delay")
+
+    def test_retry_uses_exception_delay(self, http_client):
+        """Test that retry mechanism uses the delay from the exception"""
+        call_count = 0
+
+        def side_effect(*args, **kwargs):
+            nonlocal call_count
+            call_count += 1
+            if call_count < 3:  # Fail first 2 times
+                raise requests.exceptions.ConnectionError("Connection failed")
+            # Success on 3rd attempt
+            mock_response = Mock()
+            mock_response.status_code = 200
+            return mock_response
+
+        with patch.object(http_client.session, "request", side_effect=side_effect):
+            with patch("time.sleep") as mock_sleep:
+                result = http_client._req_with_retry("GET", "https://example.com/test", "Test Step", retries=2)
+
+                assert result.status_code == 200
+                # Should have slept twice (after 1st and 2nd failures)
+                assert mock_sleep.call_count == 2
+                # Should use default delay of 4 seconds
+                mock_sleep.assert_called_with(4)
+
+    def test_retry_exhausted_marks_non_retriable(self, http_client):
+        """Test that after exhausting retries, error is marked as non-retriable"""
+        with patch.object(http_client.session, "request") as mock_request:
+            mock_request.side_effect = requests.exceptions.ConnectionError("Connection failed")
+
+            with pytest.raises(NetworkError) as exc_info:
+                http_client._req_with_retry("GET", "https://example.com/test", "Test Step", retries=1)
+
+            error = exc_info.value
+            # After retries are exhausted, can_retry should be False
+            assert error.can_retry is False
+
+    def test_no_retry_when_auto_retry_false(self, http_client):
+        """Test that retry doesn't happen when auto_retry is False"""
+        http_client.auto_retry = False
+        call_count = 0
+
+        def side_effect(*args, **kwargs):
+            nonlocal call_count
+            call_count += 1
+            raise requests.exceptions.ConnectionError("Connection failed")
+
+        with patch.object(http_client.session, "request", side_effect=side_effect):
+            with pytest.raises(NetworkError):
+                http_client._req_with_retry("GET", "https://example.com/test", "Test Step", retries=2)
+
+            # Should only be called once (no retries)
+            assert call_count == 1
+
+    def test_successful_request_no_error(self, http_client):
+        """Test that successful requests don't raise errors"""
+        with patch.object(http_client.session, "request") as mock_request:
+            mock_response = Mock()
+            mock_response.status_code = 200
+            mock_request.return_value = mock_response
+
+            result = http_client._req("GET", "https://example.com/test", "Test Step")
+
+            assert result.status_code == 200
+
+    def test_custom_retry_delay(self):
+        """Test that custom retry delay can be set on exception"""
+        exception = CertApiException("Test error")
+        exception.retry_delay = 10
+        exception.can_retry = True
+
+        assert exception.retry_delay == 10
+        assert exception.can_retry is True

{certapi-0.5.1 → certapi-1.0.0}/tests/test_keystores.py

@@ -1,3 +1,4 @@
+from time import timezone
 import pytest
 import os
 import psycopg2  # Added for PostgreSQL database creation
@@ -7,7 +8,7 @@ from certapi import Key, Certificate
 from certapi.crypto.crypto import cert_to_pem, certs_to_pem
 from certapi.keystore import SqliteKeyStore, FileSystemKeyStore, PostgresKeyStore
 from typing import List, Tuple, Union
-from datetime import datetime, timedelta
+from datetime import UTC, datetime, timedelta
 from certapi import KeyStore, Certificate, Key
 
 from cryptography import x509
@@ -163,14 +164,15 @@ def test_get_cert_by_id(keystore: KeyStore, ca_key: Key):
 
 
 def sign_csr(csr: x509.CertificateSigningRequest, issuer_key: Key, days_valid=365) -> Certificate:
+    now = datetime.now(UTC)
     builder = (
         x509.CertificateBuilder()
         .subject_name(csr.subject)
         .issuer_name(x509.Name([x509.NameAttribute(x509.NameOID.COMMON_NAME, "certapi.pytest.com")]))
         .public_key(csr.public_key())
         .serial_number(x509.random_serial_number())
-        .not_valid_before(datetime.utcnow())
-        .not_valid_after(datetime.utcnow() + timedelta(days=days_valid))
+        .not_valid_before(now)
+        .not_valid_after(now + timedelta(days=days_valid))
     )
 
     # Optionally copy extensions from CSR

certapi-0.5.1/README.md

@@ -1,52 +0,0 @@
-# CertApi
-
-CertApi is a Python package for requesting SSL certificates from ACME.
-This is to be used as a base library for building other tools, or to integrate Certificate creation feature in you app.
-
-> ⚠️ 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
-
-```bash
-pip install certapi
-```
-
-## Example: Obtain Certificate with Cloudflare
-
-```python
-import json
-from certapi import CertApiException, CloudflareChallengeSolver, Key, AcmeCertIssuer
-
-
-# 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 with a new account key
-cert_issuer = AcmeCertIssuer(Key.generate('rsa'), challenge_solver)
-
-# Preform setup i.e. fetching directory and registering ACME account
-cert_issuer.setup()
-
-try:
-    # Obtain a certificate for your domain
-    (key, cert) = cert_issuer.generate_key_and_cert_for_domain("your-domain.com")
-
-    print("------ Private Key -----")
-    print(key.to_pem())
-    print("------- Certificate ------")
-    print(cert)
-except CertApiException as e:
-    print(f"An error occurred:", json.dumps(e.json_obj(), indent=2))
-
-```
-
-
-## Example: Use High Leve API
-
-```
-```