From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 87AFA78203 for ; Thu, 29 Apr 2021 15:13:31 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 7A06A1CDFD for ; Thu, 29 Apr 2021 15:13:31 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id CC4181CDB7 for ; Thu, 29 Apr 2021 15:13:28 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id A490542E58 for ; Thu, 29 Apr 2021 15:13:28 +0200 (CEST) From: Wolfgang Bumiller To: pbs-devel@lists.proxmox.com Date: Thu, 29 Apr 2021 15:13:22 +0200 Message-Id: <20210429131322.24319-15-w.bumiller@proxmox.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210429131322.24319-1-w.bumiller@proxmox.com> References: <20210429131322.24319-1-w.bumiller@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.025 Adjusted score from AWL reputation of From: address 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 URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [node.rs] Subject: [pbs-devel] [REBASED backup 14/14] validate node config before writing 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: , X-List-Received-Date: Thu, 29 Apr 2021 13:13:31 -0000 this prevents duplicate domain entries and makes sure they can actually be deserialized into AcmeDomain structs Signed-off-by: Wolfgang Bumiller --- src/config/node.rs | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/src/config/node.rs b/src/config/node.rs index b6abeef3..18c61a45 100644 --- a/src/config/node.rs +++ b/src/config/node.rs @@ -1,7 +1,8 @@ +use std::collections::HashSet; use std::fs::File; use std::time::Duration; -use anyhow::{format_err, Error}; +use anyhow::{bail, format_err, Error}; use nix::sys::stat::Mode; use serde::{Deserialize, Serialize}; @@ -37,6 +38,8 @@ 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 raw = crate::tools::config::to_bytes(config, &NodeConfig::API_SCHEMA)?; let backup_user = crate::backup::backup_user()?; @@ -147,6 +150,19 @@ impl NodeConfig { pub fn acme_domains(&self) -> AcmeDomainIter { AcmeDomainIter::new(self) } + + /// 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); + } + } + + Ok(()) + } } pub struct AcmeDomainIter<'a> { -- 2.20.1