pylego 0.1.31__tar.gz → 0.1.32__tar.gz

{pylego-0.1.31 → pylego-0.1.32}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pylego
-Version: 0.1.31
+Version: 0.1.32
 Summary: A python wrapper package for the lego application written in Golang
 Author-email: Canonical <telco-engineers@lists.canonical.com>
 Project-URL: Homepage, https://github.com/canonical/pylego

{pylego-0.1.31 → pylego-0.1.32}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "pylego"
-version = "0.1.31"
+version = "0.1.32"
 authors = [
   { name="Canonical", email="telco-engineers@lists.canonical.com" },
 ]

{pylego-0.1.31 → pylego-0.1.32}/src/pylego/lego.go

@@ -12,6 +12,7 @@ import (
 	"errors"
 	"fmt"
 	"os"
+	"time"
 
 	"github.com/go-acme/lego/v4/certcrypto"
 	"github.com/go-acme/lego/v4/certificate"
@@ -24,12 +25,13 @@ import (
 )
 
 type LegoInputArgs struct {
-	Email      string `json:"email"`
-	PrivateKey string `json:"private_key,omitempty"`
-	Server     string `json:"server"`
-	CSR        string `json:"csr"`
-	Plugin     string `json:"plugin"`
-	Env        map[string]string
+	Email              string `json:"email"`
+	PrivateKey         string `json:"private_key,omitempty"`
+	Server             string `json:"server"`
+	CSR                string `json:"csr"`
+	Plugin             string `json:"plugin"`
+	Env                map[string]string
+	DNSPropagationWait int `json:"dns_propagation_wait,omitempty"`
 }
 
 type LegoOutputResponse struct {
@@ -58,7 +60,7 @@ func RunLegoCommand(message *C.char) *C.char {
 		}
 
 	}
-	certificate, err := requestCertificate(CLIArgs.Email, CLIArgs.PrivateKey, CLIArgs.Server, CLIArgs.CSR, CLIArgs.Plugin)
+	certificate, err := requestCertificate(CLIArgs.Email, CLIArgs.PrivateKey, CLIArgs.Server, CLIArgs.CSR, CLIArgs.Plugin, CLIArgs.DNSPropagationWait)
 	if err != nil {
 		return C.CString(fmt.Sprint("error: couldn't request certificate: ", err))
 	}
@@ -70,7 +72,7 @@ func RunLegoCommand(message *C.char) *C.char {
 	return return_message_ptr
 }
 
-func requestCertificate(email, privateKeyPem, server, csr, plugin string) (*LegoOutputResponse, error) {
+func requestCertificate(email, privateKeyPem, server, csr, plugin string, propagationWait int) (*LegoOutputResponse, error) {
 	var privateKey crypto.PrivateKey
 	if privateKeyPem != "" {
 		parsedKey, err := certcrypto.ParsePEMPrivateKey([]byte(privateKeyPem))
@@ -99,7 +101,7 @@ func requestCertificate(email, privateKeyPem, server, csr, plugin string) (*Lego
 		return nil, fmt.Errorf("couldn't create lego client: %s", err)
 	}
 
-	err = configureClientChallenges(client, plugin)
+	err = configureClientChallenges(client, plugin, propagationWait)
 	if err != nil {
 		return nil, fmt.Errorf("couldn't configure client challenges: %s", err)
 	}
@@ -140,7 +142,7 @@ func requestCertificate(email, privateKeyPem, server, csr, plugin string) (*Lego
 	}, nil
 }
 
-func configureClientChallenges(client *lego.Client, plugin string) error {
+func configureClientChallenges(client *lego.Client, plugin string, propagationWait int) error {
 	switch plugin {
 	case "", "http":
 		if err := client.Challenge.SetHTTP01Provider(http01.NewProviderServer(os.Getenv("HTTP01_IFACE"), os.Getenv("HTTP01_PORT"))); err != nil {
@@ -157,9 +159,19 @@ func configureClientChallenges(client *lego.Client, plugin string) error {
 		if err != nil {
 			return errors.Join(fmt.Errorf("couldn't create %s provider: ", plugin), err)
 		}
+		var wait time.Duration
+		if propagationWait < 0 {
+			return fmt.Errorf("DNS_PROPAGATION_WAIT cannot be negative: %d", propagationWait)
+		}
+		if propagationWait > 0 {
+			wait = time.Duration(propagationWait) * time.Second
+		}
+
 		err = client.Challenge.SetDNS01Provider(dnsProvider,
 			dns01.CondOption(os.Getenv("DNS_PROPAGATION_DISABLE_ANS") != "",
 				dns01.DisableAuthoritativeNssPropagationRequirement()),
+			dns01.CondOption(wait > 0,
+				dns01.PropagationWait(wait, true)),
 			dns01.CondOption(os.Getenv("DNS_PROPAGATION_RNS") != "", dns01.RecursiveNSsPropagationRequirement()))
 		if err != nil {
 			return errors.Join(fmt.Errorf("couldn't set %s DNS provider server: ", plugin), err)

{pylego-0.1.31 → pylego-0.1.32}/src/pylego/pylego.py

@@ -35,7 +35,13 @@ class LEGOError(Exception):
 
 
 def run_lego_command(
-    email: str, server: str, csr: bytes, env: dict[str, str], plugin: str = "", private_key: str = ""
+    email: str,
+    server: str,
+    csr: bytes,
+    env: dict[str, str],
+    plugin: str = "",
+    private_key: str = "",
+    dns_propagation_wait: int | None = None,
 ) -> LEGOResponse:
     """Run an arbitrary command in the Lego application. Read more at https://go-acme.github.io.
 
@@ -47,21 +53,27 @@ def run_lego_command(
         env: the environment variables required for the chosen plugin.
         private_key: the private key to be used for the registration on the ACME server (not the private key used to sign the CSR).
             If not provided, a new one will be generated.
+        dns_propagation_wait: optional wait duration for DNS propagation, in seconds (int).
     """
     library.RunLegoCommand.restype = ctypes.c_char_p
     library.RunLegoCommand.argtypes = [ctypes.c_char_p]
 
+    if dns_propagation_wait is not None and dns_propagation_wait < 0:
+        raise ValueError("dns_propagation_wait cannot be negative")
+
+    payload = {
+        "email": email,
+        "server": server,
+        "csr": csr.decode(),
+        "plugin": plugin,
+        "env": env,
+        "private_key": private_key,
+    }
+    if dns_propagation_wait is not None:
+        payload["dns_propagation_wait"] = dns_propagation_wait
+
     message = bytes(
-        json.dumps(
-            {
-                "email": email,
-                "server": server,
-                "csr": csr.decode(),
-                "plugin": plugin,
-                "env": env,
-                "private_key": private_key,
-            }
-        ),
+        json.dumps(payload),
         "utf-8",
     )
     result: bytes = library.RunLegoCommand(message)

{pylego-0.1.31 → pylego-0.1.32}/src/pylego.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pylego
-Version: 0.1.31
+Version: 0.1.32
 Summary: A python wrapper package for the lego application written in Golang
 Author-email: Canonical <telco-engineers@lists.canonical.com>
 Project-URL: Homepage, https://github.com/canonical/pylego

{pylego-0.1.31 → pylego-0.1.32}/src/pylego.egg-info/SOURCES.txt

@@ -6,7 +6,6 @@ src/pylego/__init__.py
 src/pylego/go.mod
 src/pylego/go.sum
 src/pylego/lego.go
-src/pylego/lego.so
 src/pylego/pylego.py
 src/pylego.egg-info/PKG-INFO
 src/pylego.egg-info/SOURCES.txt