pylego 0.1.9__py3-none-any.whl → 0.1.25__py3-none-any.whl

pylego/lego.go

@@ -23,11 +23,12 @@ import (
 )
 
 type LegoInputArgs struct {
-	Email  string `json:"email"`
-	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
 }
 
 type LegoOutputResponse struct {
@@ -56,7 +57,7 @@ func RunLegoCommand(message *C.char) *C.char {
 		}
 
 	}
-	certificate, err := requestCertificate(CLIArgs.Email, CLIArgs.Server, CLIArgs.CSR, CLIArgs.Plugin)
+	certificate, err := requestCertificate(CLIArgs.Email, CLIArgs.PrivateKey, CLIArgs.Server, CLIArgs.CSR, CLIArgs.Plugin)
 	if err != nil {
 		return C.CString(fmt.Sprint("error: couldn't request certificate: ", err))
 	}
@@ -68,10 +69,20 @@ func RunLegoCommand(message *C.char) *C.char {
 	return return_message_ptr
 }
 
-func requestCertificate(email, server, csr, plugin string) (*LegoOutputResponse, error) {
-	privateKey, err := ecdsa.GenerateKey(elliptic.P256(), rand.Reader)
-	if err != nil {
-		return nil, fmt.Errorf("couldn't generate priv key: %s", err)
+func requestCertificate(email, privateKeyPem, server, csr, plugin string) (*LegoOutputResponse, error) {
+	var privateKey crypto.PrivateKey
+	if privateKeyPem != "" {
+		parsedKey, err := certcrypto.ParsePEMPrivateKey([]byte(privateKeyPem))
+		if err != nil {
+			return nil, fmt.Errorf("couldn't parse private key: %s", err)
+		}
+		privateKey = parsedKey
+	} else {
+		generatedKey, err := ecdsa.GenerateKey(elliptic.P256(), rand.Reader)
+		if err != nil {
+			return nil, fmt.Errorf("couldn't generate priv key: %s", err)
+		}
+		privateKey = generatedKey
 	}
 	user := LetsEncryptUser{
 		Email: email,

pylego/pylego.py

@@ -35,7 +35,7 @@ class LEGOError(Exception):
 
 
 def run_lego_command(
-    email: str, server: str, csr: bytes, env: dict[str, str], plugin: str = ""
+    email: str, server: str, csr: bytes, env: dict[str, str], plugin: str = "", private_key: str = ""
 ) -> LEGOResponse:
     """Run an arbitrary command in the Lego application. Read more at https://go-acme.github.io.
 
@@ -45,6 +45,8 @@ def run_lego_command(
         csr: the csr to be signed
         plugin: which DNS provider plugin to use for the request. Find yours at https://go-acme.github.io/lego/dns/.
         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.
     """
     library.RunLegoCommand.restype = ctypes.c_char_p
     library.RunLegoCommand.argtypes = [ctypes.c_char_p]
@@ -57,6 +59,7 @@ def run_lego_command(
                 "csr": csr.decode(),
                 "plugin": plugin,
                 "env": env,
+                "private_key": private_key,
             }
         ),
         "utf-8",

{pylego-0.1.9.dist-info → pylego-0.1.25.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: pylego
-Version: 0.1.9
+Version: 0.1.25
 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
@@ -8,13 +8,10 @@ Project-URL: Issues, https://github.com/canonical/pylego/issues
 Classifier: Programming Language :: Python :: 3
 Classifier: License :: OSI Approved :: Apache Software License
 Classifier: Operating System :: OS Independent
-Requires-Python: >=3.8
+Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Provides-Extra: test
-Requires-Dist: pytest; extra == "test"
-Requires-Dist: requests; extra == "test"
-Requires-Dist: ruff; extra == "test"
+Dynamic: license-file
 
 # pylego
 
@@ -37,16 +34,17 @@ You can import the lego command and run any function that you can run from the C
 ```python
 from pylego import run_lego_command
 test_env = {"NAMECHEAP_API_USER": "user", "NAMECHEAP_API_KEY": "key"}
-run_lego_command("something@gmail.com", "https://localhost/directory", "-----BEGIN CERTIFICATE REQUEST----- ...", "namecheap", test_env)
+run_lego_command("something@gmail.com", "https://localhost/directory", "-----BEGIN CERTIFICATE REQUEST----- ...", "namecheap", test_env, "-----BEGIN RSA PRIVATE KEY-----")
 ```
 
 | Argument | Description                                                                                                                                                                                                                                                  |
 | -------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ |
-| `email`  | The provided email will be registered to LetsEncrypt. It may receive some emails notifying the user about certificate expiry.                                                                                                                                |
+| `email`  | The provided email will be registered to the ACME server. It may receive some emails notifying the user about certificate expiry.                                                                                                                                |
 | `server` | This is the full URL of a server that implements the ACME protocol. While letsencrypt is the most common one, there are other programs that provide this facility like Vault.                                                                                |
 | `csr`    | This must be a PEM string in bytes that is user generated and valid as according to the ACME server that is being provided above. Many providers have different requirements for what is allowed to be in the fields of the CSR.                             |
 | `plugin` | The plugin is a string that's supported by LEGO. The full list is located [here](https://go-acme.github.io/lego/dns/). On top of the LEGO provided ones, we have an extra plugin called `http` that will allow users to use HTTP01 and TLSALPN01 challenges. |
 | `env`    | The env is a dictionary mapping of strings to strings that will be loaded into the environment for LEGO to use. All plugins require some configuration values loaded into the environment. You can find them [here](https://go-acme.github.io/lego/dns/)     |
+| `private_key`    | The provided private key will be used to register the user to the ACME server (not the key that signed the CSR), if not provided pylego will generate a new one  |
 
 On top of the environment variables that LEGO supports, we have some extra ones that we use to configure the library:
 

pylego-0.1.25.dist-info/RECORD

@@ -0,0 +1,11 @@
+pylego/__init__.py,sha256=7rcUcQcOWsOLxTOEXF2ASkwm_7eED1UIXzxdlgKPr5c,82
+pylego/go.mod,sha256=n2-zLjKRREhmUyfj0u-VQRyEvmlp4wJcVY_Ret6v2bw,10759
+pylego/go.sum,sha256=vWXQ9GPwP6WPKjCuQ1_sWDka9PjTL2Yh28nIQeWKU80,146531
+pylego/lego.go,sha256=iXzvfVQ19PxqwFkgfxT8ueRdtIT6-cegjuzOzSuHkWs,5678
+pylego/lego.so,sha256=ObOt7e40UbDoYqJSEmuxdVvux0yQRT2VUWREKrtGRjs,161224160
+pylego/pylego.py,sha256=LD5BF1c0FM0p3M4Mqz62edNwsM0vV-tJ9J16VCWbyJU,2233
+pylego-0.1.25.dist-info/licenses/LICENSE,sha256=aklz9Y8CIpFsN61U4jHlJYp4W_8HoDpY-tINlDcdSZY,10934
+pylego-0.1.25.dist-info/METADATA,sha256=HXxrOi6AMeyJemyvn8DE1nlNNclk5oo7juLllTwnB30,5637
+pylego-0.1.25.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+pylego-0.1.25.dist-info/top_level.txt,sha256=pSOYv55_w90qy3xOvqz_ysSz-X-XRTb-jMpiOyLNnNs,7
+pylego-0.1.25.dist-info/RECORD,,

{pylego-0.1.9.dist-info → pylego-0.1.25.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.6.0)
+Generator: setuptools (80.9.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

pylego-0.1.9.dist-info/RECORD

@@ -1,11 +0,0 @@
-pylego/__init__.py,sha256=7rcUcQcOWsOLxTOEXF2ASkwm_7eED1UIXzxdlgKPr5c,82
-pylego/go.mod,sha256=S-5MY_3fsoWvQMLkUAox6lnwtL3IX05pjiAlPQhfwPU,9469
-pylego/go.sum,sha256=HpR7HGB2ICojeKlw4xYXn_Q2dwUv1oS8GuYPTBXrk9I,98044
-pylego/lego.go,sha256=52e3iR6uc70EszJDNYCpM_78Cb6zZuYj1kK9L5ZBz9Y,5281
-pylego/lego.so,sha256=oeSx3nCQaTCUsUCagXOtjbBoINksfgv8XrLp6mDHGZE,140895672
-pylego/pylego.py,sha256=bHsVzqMM2DZmhCAn-yqlxKQ4Pr5QRyOpBjP2dJSBKMU,1976
-pylego-0.1.9.dist-info/LICENSE,sha256=aklz9Y8CIpFsN61U4jHlJYp4W_8HoDpY-tINlDcdSZY,10934
-pylego-0.1.9.dist-info/METADATA,sha256=2soVxPs33-JahfztbWOY_i9RG4_LYej0vuOq4zgTjpY,5528
-pylego-0.1.9.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-pylego-0.1.9.dist-info/top_level.txt,sha256=pSOYv55_w90qy3xOvqz_ysSz-X-XRTb-jMpiOyLNnNs,7
-pylego-0.1.9.dist-info/RECORD,,