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 A77531FF140 for ; Fri, 27 Mar 2026 13:13:44 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 0559988B8; Fri, 27 Mar 2026 13:14:08 +0100 (CET) From: Christian Ebner To: pbs-devel@lists.proxmox.com Subject: [PATCH proxmox-backup v4 4/8] config: inline NodeConfig::validate() to its only call side Date: Fri, 27 Mar 2026 13:13:15 +0100 Message-ID: <20260327121319.628881-5-c.ebner@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260327121319.628881-1-c.ebner@proxmox.com> References: <20260327121319.628881-1-c.ebner@proxmox.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1774613563138 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.060 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 RCVD_IN_VALIDITY_CERTIFIED_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_RPBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_SAFE_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Message-ID-Hash: CPIOOD3LDE4H5E4SGLN7PFQUSXNXW733 X-Message-ID-Hash: CPIOOD3LDE4H5E4SGLN7PFQUSXNXW733 X-MailFrom: c.ebner@proxmox.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.10 Precedence: list List-Id: Proxmox Backup Server development discussion List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: Helps to avoid any dependency on the openssl crate when moving the NodeConfig to the pbs-api-types crate, which is itself done in order to move the node config implementation to pbs-config. Having the implementation in pbs-config will allow to easily access the node config from pbs-datastore, in order to read the node proxy config. Signed-off-by: Christian Ebner Reviewed-by: Fabian Grünbichler --- src/config/node.rs | 35 ++++++++++++++--------------------- 1 file changed, 14 insertions(+), 21 deletions(-) diff --git a/src/config/node.rs b/src/config/node.rs index c01c6aa7a..93173e66f 100644 --- a/src/config/node.rs +++ b/src/config/node.rs @@ -34,7 +34,20 @@ pub fn config() -> Result<(NodeConfig, [u8; 32]), Error> { /// Write the Node Config, requires the write lock to be held. pub fn save_config(config: &NodeConfig) -> Result<(), Error> { - config.validate()?; + let mut domains = HashSet::new(); + for domain in config.acme_domains() { + let domain = domain?; + if !domains.insert(domain.domain.to_lowercase()) { + bail!("duplicate domain '{}' in ACME config", domain.domain); + } + } + let mut dummy_acceptor = SslAcceptor::mozilla_intermediate_v5(SslMethod::tls()).unwrap(); + if let Some(ciphers) = config.ciphers_tls_1_3.as_deref() { + dummy_acceptor.set_ciphersuites(ciphers)?; + } + if let Some(ciphers) = config.ciphers_tls_1_2.as_deref() { + dummy_acceptor.set_cipher_list(ciphers)?; + } let raw = crate::tools::config::to_bytes(config, &NodeConfig::API_SCHEMA)?; pbs_config::replace_backup_config(CONF_FILE, &raw) @@ -246,26 +259,6 @@ impl NodeConfig { pub fn set_http_proxy(&mut self, http_proxy: Option) { self.http_proxy = http_proxy; } - - /// Validate the configuration. - pub fn validate(&self) -> Result<(), Error> { - let mut domains = HashSet::new(); - for domain in self.acme_domains() { - let domain = domain?; - if !domains.insert(domain.domain.to_lowercase()) { - bail!("duplicate domain '{}' in ACME config", domain.domain); - } - } - let mut dummy_acceptor = SslAcceptor::mozilla_intermediate_v5(SslMethod::tls()).unwrap(); - if let Some(ciphers) = self.ciphers_tls_1_3.as_deref() { - dummy_acceptor.set_ciphersuites(ciphers)?; - } - if let Some(ciphers) = self.ciphers_tls_1_2.as_deref() { - dummy_acceptor.set_cipher_list(ciphers)?; - } - - Ok(()) - } } pub struct AcmeDomainIter<'a> { -- 2.47.3