From: Stoiko Ivanov <s.ivanov@proxmox.com>
To: pmg-devel@lists.proxmox.com
Subject: [pmg-devel] [PATCH proxmox-acme 2/2] dns-challenge: add 'use-proxy' property
Date: Tue, 9 Nov 2021 17:20:03 +0100 [thread overview]
Message-ID: <20211109162009.3186-3-s.ivanov@proxmox.com> (raw)
In-Reply-To: <20211109162009.3186-1-s.ivanov@proxmox.com>
this patch adds an optional 'use-proxy' property to the dns
challenges.
If set to 1 the caller is expected to add the proxy url in the plugin
config, which is then set as 'http_proxy' and 'https_proxy'
environment variable by the plugin caller (and then used by curl)
Tested with the pdns plugin, direct traffic to the pdns server being
dropped, and a configured squid proxy
Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
---
src/PVE/ACME/DNSChallenge.pm | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/src/PVE/ACME/DNSChallenge.pm b/src/PVE/ACME/DNSChallenge.pm
index 9b28970..c03b3db 100644
--- a/src/PVE/ACME/DNSChallenge.pm
+++ b/src/PVE/ACME/DNSChallenge.pm
@@ -50,7 +50,12 @@ sub properties {
optional => 1,
minimum => 0,
maximum => 2 * 24 * 60 * 60,
- }
+ },
+ 'use-proxy' => {
+ description => "Flag indicating whether a http proxy should be used.",
+ type => 'boolean',
+ optional => 1,
+ },
};
}
@@ -61,6 +66,7 @@ sub options {
nodes => { optional => 1 },
disable => { optional => 1 },
'validation-delay' => { optional => 1 },
+ 'use-proxy' => { optional => 1 },
};
}
@@ -78,6 +84,7 @@ my $proxmox_acme_command = sub {
my $txtvalue = PVE::ACME::encode(sha256($key_auth));
my $dnsplugin = $data->{plugin}->{api};
my $plugin_conf_string = $data->{plugin}->{data};
+ my $proxy = $data->{plugin}->{proxy};
# for security reasons, we execute the command as nobody
# we can't verify that the code of the DNSPlugins are harmless.
@@ -93,6 +100,7 @@ my $proxmox_acme_command = sub {
}
my $input = "$txtvalue\n";
$input .= "$plugin_conf_string\n" if $plugin_conf_string;
+ $input .= "https_proxy=$proxy\nhttp_proxy=$proxy\n" if $proxy;
PVE::Tools::run_command($cmd, input => $input);
--
2.30.2
next prev parent reply other threads:[~2021-11-09 16:20 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-11-09 16:20 [pmg-devel] [PATCH pmg-api/proxmox-acme/various] acme: add support for http_proxy Stoiko Ivanov
2021-11-09 16:20 ` [pmg-devel] [PATCH proxmox-acme 1/2] add support for proxies Stoiko Ivanov
2021-11-09 16:20 ` Stoiko Ivanov [this message]
2021-11-09 16:20 ` [pmg-devel] [PATCH proxmox-acme-rs 1/1] client: " Stoiko Ivanov
2021-11-09 16:20 ` [pmg-devel] [PATCH pmg-rs 1/2] add support for set_proxy Stoiko Ivanov
2021-11-18 10:22 ` [pmg-devel] applied: " Wolfgang Bumiller
2021-11-09 16:20 ` [pmg-devel] [PATCH pmg-rs 2/2] update to perlmod 0.8 Stoiko Ivanov
2021-11-18 10:23 ` [pmg-devel] applied: " Wolfgang Bumiller
2021-11-09 16:20 ` [pmg-devel] [PATCH widget-toolkit 1/1] acmeplugin: add use-proxy checkbox Stoiko Ivanov
2021-11-09 16:20 ` [pmg-devel] [PATCH pmg-api 1/2] api: acme: set http_proxy if configured in pmg.conf Stoiko Ivanov
2021-11-09 16:20 ` [pmg-devel] [PATCH pmg-api 2/2] api: acme: dns-plugin: conditionally pass proxy to acme.sh wrapper Stoiko Ivanov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20211109162009.3186-3-s.ivanov@proxmox.com \
--to=s.ivanov@proxmox.com \
--cc=pmg-devel@lists.proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox