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 A449F72D17 for ; Wed, 16 Jun 2021 20:36:53 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 95A101532D for ; Wed, 16 Jun 2021 20:36:53 +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 F359815322 for ; Wed, 16 Jun 2021 20:36:51 +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 C16EC4404F for ; Wed, 16 Jun 2021 20:36:51 +0200 (CEST) From: Stoiko Ivanov To: pmg-devel@lists.proxmox.com Date: Wed, 16 Jun 2021 20:36:40 +0200 Message-Id: <20210616183640.3930-1-s.ivanov@proxmox.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.835 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% 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. [proxmox.com, nodeconfig.pm] Subject: [pmg-devel] [PATCH pmg-api] api: nodeconfig: validate acme config before writing X-BeenThere: pmg-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Mail Gateway development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Jun 2021 18:36:53 -0000 Currently it is possible to add the same domains as different acmedomainX keys to the node config, which prevents the user from ordering certificates later. This patch adds a call to get_acme_conf, which does the semantic validation (and is also used in all other sites, which read the config). Reported in our community forum: https://forum.proxmox.com/threads/lets-encrypt-cert-on-gui-not-working.91014/ quickly tested in my setup, by successfully adding the same domain twice without the patch, and failing to do so with it applied. Signed-off-by: Stoiko Ivanov --- src/PMG/API2/NodeConfig.pm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/PMG/API2/NodeConfig.pm b/src/PMG/API2/NodeConfig.pm index 284f663..bfbbacd 100644 --- a/src/PMG/API2/NodeConfig.pm +++ b/src/PMG/API2/NodeConfig.pm @@ -81,6 +81,9 @@ __PACKAGE__->register_method ({ $conf->{$opt} = $param->{$opt}; } + #validate the acme config (check for duplicates) + PMG::NodeConfig::get_acme_conf($conf); + PMG::NodeConfig::write_config($conf); }); -- 2.20.1