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 520757DE82 for ; Tue, 9 Nov 2021 17:36:45 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 1383510A32 for ; Tue, 9 Nov 2021 17:36:45 +0100 (CET) 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 AF6AA10A1A for ; Tue, 9 Nov 2021 17:36:43 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 223C842AB7 for ; Tue, 9 Nov 2021 17:36:43 +0100 (CET) From: Stoiko Ivanov To: pve-devel@lists.proxmox.com Date: Tue, 9 Nov 2021 17:36:32 +0100 Message-Id: <20211109163633.1721670-6-s.ivanov@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20211109163633.1721670-1-s.ivanov@proxmox.com> References: <20211109163633.1721670-1-s.ivanov@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.349 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. [acme.sh, acme.pm] Subject: [pve-devel] [PATCH manager 2/3] api: acme: dns-plugin: conditionally pass proxy to acme.sh wrapper X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 09 Nov 2021 16:36:45 -0000 partially fixes #3536 If an acme (dns) plugin has set the 'use-proxy' flag, pass the http_proxy configured in datacenter.cfg. The setting is configurable for each dns-plugin, based on the assumption that some dns-apis might be 'local' (e.g. a pdns-server in the internal network) and communication with them must not pass through the proxy. The implementation follows the one in PMG Signed-off-by: Stoiko Ivanov --- PVE/API2/ACME.pm | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/PVE/API2/ACME.pm b/PVE/API2/ACME.pm index 6e6f44f6..de6068bf 100644 --- a/PVE/API2/ACME.pm +++ b/PVE/API2/ACME.pm @@ -74,6 +74,13 @@ my $order_certificate = sub { die "plugin '$plugin_id' for domain '$domain' not found!\n" if !$plugin_cfg; + if ($plugin_cfg->{'use-proxy'}) { + my $dccfg = PVE::Cluster::cfs_read_file('datacenter.cfg'); + if (my $http_proxy = $dccfg->{http_proxy}) { + $plugin_cfg->{proxy} = $http_proxy; + } + } + my $data = { plugin => $plugin_cfg, alias => $domain_config->{alias}, -- 2.30.2