From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [IPv6:2a01:7e0:0:424::9]) by lore.proxmox.com (Postfix) with ESMTPS id 0259D1FF175 for ; Fri, 16 Jan 2026 12:29:37 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id A6DFA17706; Fri, 16 Jan 2026 12:29:41 +0100 (CET) From: Samuel Rufinatscha To: pbs-devel@lists.proxmox.com Date: Fri, 16 Jan 2026 12:28:55 +0100 Message-ID: <20260116112859.194016-2-s.rufinatscha@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260116112859.194016-1-s.rufinatscha@proxmox.com> References: <20260116112859.194016-1-s.rufinatscha@proxmox.com> MIME-Version: 1.0 X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1768562898169 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.248 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: [pbs-devel] [PATCH proxmox v6 1/3] acme-api: add ACME completion helpers X-BeenThere: pbs-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Backup Server development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Proxmox Backup Server development discussion Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pbs-devel-bounces@lists.proxmox.com Sender: "pbs-devel" Factors out the PBS ACME completion helpers and adds them to proxmox-acme-api. Signed-off-by: Samuel Rufinatscha --- proxmox-acme-api/src/challenge_schemas.rs | 2 +- proxmox-acme-api/src/lib.rs | 57 +++++++++++++++++++++++ 2 files changed, 58 insertions(+), 1 deletion(-) diff --git a/proxmox-acme-api/src/challenge_schemas.rs b/proxmox-acme-api/src/challenge_schemas.rs index e66e327e..4e94d3ff 100644 --- a/proxmox-acme-api/src/challenge_schemas.rs +++ b/proxmox-acme-api/src/challenge_schemas.rs @@ -29,7 +29,7 @@ impl Serialize for ChallengeSchemaWrapper { } } -fn load_dns_challenge_schema() -> Result, Error> { +pub(crate) fn load_dns_challenge_schema() -> Result, Error> { let raw = file_read_string(ACME_DNS_SCHEMA_FN)?; let schemas: serde_json::Map = serde_json::from_str(&raw)?; diff --git a/proxmox-acme-api/src/lib.rs b/proxmox-acme-api/src/lib.rs index 623e9e23..ba64569d 100644 --- a/proxmox-acme-api/src/lib.rs +++ b/proxmox-acme-api/src/lib.rs @@ -46,3 +46,60 @@ pub(crate) mod acme_plugin; mod certificate_helpers; #[cfg(feature = "impl")] pub use certificate_helpers::{create_self_signed_cert, order_certificate, revoke_certificate}; + +#[cfg(feature = "impl")] +pub mod completion { + + use std::collections::HashMap; + use std::ops::ControlFlow; + + use crate::account_config::foreach_acme_account; + use crate::challenge_schemas::load_dns_challenge_schema; + use crate::plugin_config::plugin_config; + + pub fn complete_acme_account(_arg: &str, _param: &HashMap) -> Vec { + let mut out = Vec::new(); + let _ = foreach_acme_account(|name| { + out.push(name.into_string()); + ControlFlow::Continue(()) + }); + out + } + + pub fn complete_acme_plugin(_arg: &str, _param: &HashMap) -> Vec { + match plugin_config() { + Ok((config, _digest)) => config + .iter() + .map(|(id, (_type, _cfg))| id.clone()) + .collect(), + Err(_) => Vec::new(), + } + } + + pub fn complete_acme_plugin_type(_arg: &str, _param: &HashMap) -> Vec { + vec![ + "dns".to_string(), + //"http".to_string(), // makes currently not really sense to create or the like + ] + } + + pub fn complete_acme_api_challenge_type( + _arg: &str, + param: &HashMap, + ) -> Vec { + if param.get("type") == Some(&"dns".to_string()) { + match load_dns_challenge_schema() { + Ok(schema) => schema.into_iter().map(|s| s.id).collect(), + Err(_) => Vec::new(), + } + } else { + Vec::new() + } + } +} + +#[cfg(feature = "impl")] +pub use completion::{ + complete_acme_account, complete_acme_api_challenge_type, complete_acme_plugin, + complete_acme_plugin_type, +}; -- 2.47.3 _______________________________________________ pbs-devel mailing list pbs-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel