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 E44BC71537 for ; Mon, 28 Jun 2021 20:41:25 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id E1B152E91F for ; Mon, 28 Jun 2021 20:41:25 +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) server-digest SHA256) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id 31E112E96D for ; Mon, 28 Jun 2021 20:41:24 +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 F142E467BE for ; Mon, 28 Jun 2021 20:41:23 +0200 (CEST) From: Stoiko Ivanov To: pbs-devel@lists.proxmox.com Date: Mon, 28 Jun 2021 18:41:09 +0000 Message-Id: <20210628184109.110296-4-s.ivanov@proxmox.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210628184109.110296-1-s.ivanov@proxmox.com> References: <20210628184109.110296-1-s.ivanov@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.547 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 PROLO_LEO1 0.1 Meta Catches all Leo drug variations so far 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-backup v2 3/3] fix #3496: acme: plugin: add sleep for dns propagation 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: Mon, 28 Jun 2021 18:41:25 -0000 the dns plugin config allow for a specified amount of time to wait for the TXT record to be set and propagated through DNS. This patch adds a sleep for this amount of time. The log message was taken from the perl implementation in proxmox-acme for consistency. Tested with the powerdns plugin in my test setup. Signed-off-by: Stoiko Ivanov --- src/acme/plugin.rs | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/src/acme/plugin.rs b/src/acme/plugin.rs index 0269b9ad..11939cf7 100644 --- a/src/acme/plugin.rs +++ b/src/acme/plugin.rs @@ -2,6 +2,7 @@ use std::future::Future; use std::pin::Pin; use std::process::Stdio; use std::sync::Arc; +use std::time::Duration; use anyhow::{bail, format_err, Error}; use hyper::{Body, Request, Response}; @@ -180,7 +181,21 @@ impl AcmePlugin for DnsPlugin { domain: &'d AcmeDomain, task: Arc, ) -> Pin> + Send + 'fut>> { - Box::pin(self.action(client, authorization, domain, task, "setup")) + Box::pin(async move { + let result = self + .action(client, authorization, domain, task.clone(), "setup") + .await; + let validation_delay = self.core.validation_delay.unwrap_or(30) as u64; + + if validation_delay > 0 { + task.log(format!( + "Sleeping {} seconds to wait for TXT record propagation", + validation_delay + )); + tokio::time::sleep(Duration::from_secs(validation_delay)).await; + } + result + }) } fn teardown<'fut, 'a: 'fut, 'b: 'fut, 'c: 'fut, 'd: 'fut>( -- 2.20.1