From b9f4044a6f6f076d0f38819727d281af031a26c3 Mon Sep 17 00:00:00 2001 From: Q Misell Date: Tue, 1 Oct 2024 21:37:06 +0200 Subject: [PATCH] move Arti RPC calls to x_acme_ experimental namespace --- pyproject.toml | 2 +- rust/src/arti.rs | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 85a5d77..7f2b784 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [project] name = "certbot-onion" -version = "0.3.0" +version = "0.3.1" description = "Certbot authenticator plugin for the onion-csr-01 challenge" authors = [ {name = "Q Misell", email = "q@as207960.net"} diff --git a/rust/src/arti.rs b/rust/src/arti.rs index 72b0e4e..62a6e09 100644 --- a/rust/src/arti.rs +++ b/rust/src/arti.rs @@ -63,7 +63,7 @@ impl ArtiClient { } fn get_onion_service(&self, domain: &str) -> PyResult { - let resp = self.client.execute(&ArtiRequest::new(self.client.session().unwrap(), "arti:get_onion_service", ArtiOnionServiceRequest { + let resp = self.client.execute(&ArtiRequest::new(self.client.session().unwrap(), "arti:x_acme_get_onion_service", ArtiOnionServiceRequest { domain }).encode()) .map_err(|e| PyErr::new::(format!("protocol error: {}", e)))? @@ -81,7 +81,7 @@ impl ArtiClient { #[pymethods] impl ArtiOnionService { fn onion_name(&self) -> PyResult { - let resp = self.client.execute(&ArtiRequest::new(&self.object_id, "arti:onion_service_name", ArtiOnionServiceNameRequest {}).encode()) + let resp = self.client.execute(&ArtiRequest::new(&self.object_id, "arti:x_acme_onion_service_name", ArtiOnionServiceNameRequest {}).encode()) .map_err(|e| PyErr::new::(format!("protocol error: {}", e)))? .map_err(|e| PyErr::new::(format!("unable to get onion service name: {}", e)))?; @@ -90,7 +90,7 @@ impl ArtiOnionService { } fn make_csr(&self, ca_nonce: &[u8]) -> PyResult> { - let resp = self.client.execute(&ArtiRequest::new(&self.object_id, "arti:onion_service_csr", ArtiCsrRequest { + let resp = self.client.execute(&ArtiRequest::new(&self.object_id, "arti:x_acme_onion_service_csr", ArtiCsrRequest { ca_nonce: base64ct::Base64::encode_string(ca_nonce) }).encode()) .map_err(|e| PyErr::new::(format!("protocol error: {}", e)))? @@ -104,7 +104,7 @@ impl ArtiOnionService { } fn sign_caa(&self, expiry: u32) -> PyResult { - let resp = self.client.execute(&ArtiRequest::new(&self.object_id, "arti:onion_service_caa", ArtiCaaRequest { + let resp = self.client.execute(&ArtiRequest::new(&self.object_id, "arti:x_acme_onion_service_caa", ArtiCaaRequest { expiry, }).encode()) .map_err(|e| PyErr::new::(format!("protocol error: {}", e)))?