[pbs-devel] [PATCH proxmox-backup 5/6] acme: plugin: add 'use-proxy' property

Stoiko Ivanov s.ivanov at proxmox.com
Tue Nov 9 17:54:21 CET 2021


this patch adds an optional 'use-proxy' property to the dns challenge
plugins.

If set to true and the node has configured an http_proxy the proxy
is set as 'http_proxy' and 'https_proxy' environment variable by the
plugin caller (and then used by curl)

Signed-off-by: Stoiko Ivanov <s.ivanov at proxmox.com>
---
 src/acme/plugin.rs        | 21 +++++++++++++++++++++
 src/api2/config/acme.rs   | 12 ++++++++++++
 src/config/acme/plugin.rs |  8 ++++++++
 3 files changed, 41 insertions(+)

diff --git a/src/acme/plugin.rs b/src/acme/plugin.rs
index 65eb60d1..d31c2b8f 100644
--- a/src/acme/plugin.rs
+++ b/src/acme/plugin.rs
@@ -13,6 +13,7 @@ use proxmox_acme_rs::{Authorization, Challenge};
 
 use crate::acme::AcmeClient;
 use crate::api2::types::AcmeDomain;
+use crate::config::node;
 use proxmox_rest_server::WorkerTask;
 
 use crate::config::acme::plugin::{DnsPlugin, PluginData};
@@ -111,6 +112,26 @@ impl DnsPlugin {
             stdin_data.push(b'\n');
         }
 
+        let proxy_config = match self.core.use_proxy {
+            Some(true) => {
+                if let Ok((node_config, _digest)) = node::config() {
+                    node_config.http_proxy()
+                } else {
+                    None
+                }
+            }
+            Some(false) => None,
+            None => None,
+        };
+
+        if let Some(proxy_config) = proxy_config {
+            if let Ok(proxystr) = proxy_config.to_proxy_string() {
+                stdin_data.extend(
+                    format!("http_proxy={}\nhttps_proxy={}\n", proxystr, proxystr).as_bytes(),
+                );
+                stdin_data.push(b'\n');
+            }
+        }
         let mut command = Command::new("/usr/bin/setpriv");
 
         #[rustfmt::skip]
diff --git a/src/api2/config/acme.rs b/src/api2/config/acme.rs
index a37a9358..c52edd57 100644
--- a/src/api2/config/acme.rs
+++ b/src/api2/config/acme.rs
@@ -473,6 +473,10 @@ pub struct PluginConfig {
     /// Flag to disable the config.
     #[serde(skip_serializing_if = "Option::is_none", default)]
     disable: Option<bool>,
+
+    /// Flag indicating if this plugin should use the node-wide proxy setting.
+    #[serde(skip_serializing_if = "Option::is_none", default)]
+    use_proxy: Option<bool>,
 }
 
 // See PMG/PVE's $modify_cfg_for_api sub
@@ -639,6 +643,8 @@ pub enum DeletableProperty {
     disable,
     /// Delete the validation-delay property
     validation_delay,
+    /// Delete the use-proxy property
+    use_proxy,
 }
 
 #[api(
@@ -716,6 +722,9 @@ pub fn update_plugin(
                         DeletableProperty::disable => {
                             plugin.core.disable = None;
                         }
+                        DeletableProperty::use_proxy => {
+                            plugin.core.use_proxy = None;
+                        }
                     }
                 }
             }
@@ -731,6 +740,9 @@ pub fn update_plugin(
             if update.disable.is_some() {
                 plugin.core.disable = update.disable;
             }
+            if update.use_proxy.is_some() {
+                plugin.core.use_proxy = update.use_proxy;
+            }
 
             *entry = serde_json::to_value(plugin)?;
         }
diff --git a/src/config/acme/plugin.rs b/src/config/acme/plugin.rs
index 6ba5bcf7..8eade7c1 100644
--- a/src/config/acme/plugin.rs
+++ b/src/config/acme/plugin.rs
@@ -52,6 +52,10 @@ impl Default for StandalonePlugin {
             minimum: 0,
             maximum: 2 * 24 * 60 * 60,
         },
+        "use-proxy": {
+            optional: true,
+            default: false,
+        },
     },
 )]
 /// DNS ACME Challenge Plugin core data.
@@ -74,6 +78,10 @@ pub struct DnsPluginCore {
     /// Flag to disable the config.
     #[serde(skip_serializing_if = "Option::is_none", default)]
     pub disable: Option<bool>,
+
+    /// Flag indicating if this plugin should use the node-wide proxy setting.
+    #[serde(skip_serializing_if = "Option::is_none", default)]
+    pub use_proxy: Option<bool>,
 }
 
 #[api(
-- 
2.30.2





More information about the pbs-devel mailing list