From: Hannes Laimer <h.laimer@proxmox.com>
To: pbs-devel@lists.proxmox.com
Subject: [pbs-devel] [PATCH proxmox-backup] node: acme: use configured proxy for acme dns challenges
Date: Thu, 7 Mar 2024 11:26:19 +0100 [thread overview]
Message-ID: <20240307102619.45249-1-h.laimer@proxmox.com> (raw)
Signed-off-by: Hannes Laimer <h.laimer@proxmox.com>
---
came up in support, and I don't think there's a good reason to not also
use the proxy for ACME DNS challenges. tested with local proxy, curl
in `proxmox-acme` picked the env vars up correctly and used the proxy
docs/package-repositories.rst | 5 +++--
src/acme/plugin.rs | 9 +++++++++
2 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/docs/package-repositories.rst b/docs/package-repositories.rst
index b429b4b4..969cca3c 100644
--- a/docs/package-repositories.rst
+++ b/docs/package-repositories.rst
@@ -212,8 +212,9 @@ Some setups have restricted access to the internet, sometimes only through a
central proxy. You can setup a HTTP proxy through the Proxmox Backup Server's
web-interface in the `Configuration -> Authentication` tab.
-Once configured this proxy will be used for apt network requests and for
-checking a Proxmox Backup Server support subscription.
+Once configured this proxy will be used for apt network requests, for
+checking a Proxmox Backup Server support subscription and for ACME DNS challenge
+requests.
Standard HTTP proxy configurations are accepted, `[http://]<host>[:port]` where
the `<host>` part may include an authorization, for example:
diff --git a/src/acme/plugin.rs b/src/acme/plugin.rs
index 200cf9cc..db464afe 100644
--- a/src/acme/plugin.rs
+++ b/src/acme/plugin.rs
@@ -113,6 +113,12 @@ impl DnsPlugin {
let mut command = Command::new("/usr/bin/setpriv");
+ let (node_config, _digest) = crate::config::node::config()?;
+ let proxy: Option<String> = node_config
+ .http_proxy()
+ .map(|p| p.to_proxy_string())
+ .and_then(Result::ok);
+
#[rustfmt::skip]
command.args([
"--reuid", "nobody",
@@ -120,6 +126,9 @@ impl DnsPlugin {
"--clear-groups",
"--reset-env",
"--",
+ "/bin/env",
+ &proxy.as_ref().map_or("".to_string(), |p| format!("http_proxy={}", p)),
+ &proxy.as_ref().map_or("".to_string(), |p| format!("https_proxy={}", p)),
"/bin/bash",
PROXMOX_ACME_SH_PATH,
action,
--
2.39.2
next reply other threads:[~2024-03-07 10:27 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-03-07 10:26 Hannes Laimer [this message]
2024-07-01 9:09 ` Fabian Grünbichler
2024-07-01 9:26 ` Hannes Laimer
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=20240307102619.45249-1-h.laimer@proxmox.com \
--to=h.laimer@proxmox.com \
--cc=pbs-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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.