public inbox for pve-devel@lists.proxmox.com
 help / color / mirror / Atom feed
From: Lukas Wagner <l.wagner@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [PATCH proxmox v2 26/63] notify: context: parse proxy config in trait impl, not at the callsite
Date: Wed, 18 Nov 2026 10:43:10 +0100	[thread overview]
Message-ID: <20261118094348.273646-27-l.wagner@proxmox.com> (raw)
In-Reply-To: <20261118094348.273646-1-l.wagner@proxmox.com>

This makes it easier to at some point introduce different proxy schemes
for http vs. https URLs, and it also decouples proxmox-notify from the
concrete string format used to configure proxies.

The trait method was renamed to `proxy_config` to preemptively avoid any
confusion if we ever introduce a differentiation between http and https
proxies.

Signed-off-by: Lukas Wagner <l.wagner@proxmox.com>
---
 proxmox-notify/Cargo.toml               |  5 ++++-
 proxmox-notify/src/context/mod.rs       |  3 ++-
 proxmox-notify/src/context/pbs.rs       | 11 ++++++++---
 proxmox-notify/src/context/pve.rs       |  9 +++++++--
 proxmox-notify/src/context/test.rs      |  5 +++--
 proxmox-notify/src/endpoints/gotify.rs  |  6 ++----
 proxmox-notify/src/endpoints/webhook.rs |  6 ++----
 7 files changed, 28 insertions(+), 17 deletions(-)

diff --git a/proxmox-notify/Cargo.toml b/proxmox-notify/Cargo.toml
index 5f7ea3176..611aebba6 100644
--- a/proxmox-notify/Cargo.toml
+++ b/proxmox-notify/Cargo.toml
@@ -28,7 +28,7 @@ thiserror.workspace = true
 proxmox-api-macro = { workspace = true, optional = true }
 proxmox-base64 = { workspace = true, optional = true }
 proxmox-config-digest = { workspace = true, features = ["openssl"], optional = true }
-proxmox-http = { workspace = true, features = ["client-sync"], optional = true }
+proxmox-http = { workspace = true, optional = true }
 proxmox-http-error = { workspace = true, optional = true }
 proxmox-human-byte = { workspace = true, optional = true }
 proxmox-match-expression = { workspace = true, optional = true }
@@ -48,6 +48,8 @@ default = ["send-impl", "api-types"]
 api-impl = [
     "api-types",
     "dep:proxmox-config-digest",
+    "dep:proxmox-http",
+    "proxmox-http/http-helpers",
     "dep:proxmox-http-error",
     "dep:proxmox-section-config",
 ]
@@ -67,6 +69,7 @@ send-impl = [
     "dep:percent-encoding",
     "dep:proxmox-base64",
     "dep:proxmox-http",
+    "proxmox-http/client-sync",
     "dep:proxmox-human-byte",
     "dep:proxmox-section-config",
     "dep:proxmox-sendmail",
diff --git a/proxmox-notify/src/context/mod.rs b/proxmox-notify/src/context/mod.rs
index edc147f4a..c31e108fd 100644
--- a/proxmox-notify/src/context/mod.rs
+++ b/proxmox-notify/src/context/mod.rs
@@ -2,6 +2,7 @@ use std::fmt::{Debug, Display};
 use std::ops::Deref;
 use std::sync::Arc;
 
+use proxmox_http::ProxyConfig;
 use proxmox_section_config::typed::SectionConfigData;
 
 use crate::config::ConfigEntity;
@@ -52,7 +53,7 @@ pub trait ContextImpl: Send + Sync + Debug {
     /// Default from address for sendmail-based targets
     fn default_sendmail_from(&self) -> String;
     /// Proxy configuration for the current node
-    fn http_proxy_config(&self) -> Option<String>;
+    fn proxy_config(&self) -> Result<Option<ProxyConfig>, BoxedError>;
     /// Return default config for built-in targets/matchers.
     fn default_config(&self) -> &'static SectionConfigData<ConfigEntity>;
     /// Return the path of `filename` from `source` and a certain (optional) `namespace`
diff --git a/proxmox-notify/src/context/pbs.rs b/proxmox-notify/src/context/pbs.rs
index b76412ad1..7d3c51677 100644
--- a/proxmox-notify/src/context/pbs.rs
+++ b/proxmox-notify/src/context/pbs.rs
@@ -1,11 +1,12 @@
 use std::path::Path;
 use std::sync::OnceLock;
 
-use proxmox_section_config::typed::{ApiSectionDataEntry, SectionConfigData};
 use serde::Deserialize;
 use tracing::error;
 
+use proxmox_http::ProxyConfig;
 use proxmox_schema::{ObjectSchema, Schema, StringSchema};
+use proxmox_section_config::typed::{ApiSectionDataEntry, SectionConfigData};
 use proxmox_section_config::{SectionConfig, SectionConfigPlugin};
 
 use crate::config::ConfigEntity;
@@ -99,9 +100,13 @@ impl ContextImpl for PBSContext {
             .unwrap_or_else(|| String::from("root"))
     }
 
-    fn http_proxy_config(&self) -> Option<String> {
+    fn proxy_config(&self) -> Result<Option<ProxyConfig>, BoxedError> {
         let content = common::attempt_file_read(PBS_NODE_CFG_FILENAME);
-        content.and_then(|content| common::lookup_datacenter_config_key(&content, "http-proxy"))
+        content
+            .and_then(|content| common::lookup_datacenter_config_key(&content, "http-proxy"))
+            .map(|url| ProxyConfig::parse_proxy_url(&url))
+            .transpose()
+            .map_err(Into::into)
     }
 
     fn default_config(&self) -> &'static SectionConfigData<ConfigEntity> {
diff --git a/proxmox-notify/src/context/pve.rs b/proxmox-notify/src/context/pve.rs
index 1a5d33ca1..a020b5cb4 100644
--- a/proxmox-notify/src/context/pve.rs
+++ b/proxmox-notify/src/context/pve.rs
@@ -1,6 +1,7 @@
 use std::path::Path;
 use std::sync::OnceLock;
 
+use proxmox_http::ProxyConfig;
 use proxmox_section_config::typed::{ApiSectionDataEntry, SectionConfigData};
 
 use crate::config::ConfigEntity;
@@ -50,9 +51,13 @@ impl ContextImpl for PVEContext {
             .unwrap_or_else(|| String::from("root"))
     }
 
-    fn http_proxy_config(&self) -> Option<String> {
+    fn proxy_config(&self) -> Result<Option<ProxyConfig>, BoxedError> {
         let content = common::attempt_file_read("/etc/pve/datacenter.cfg");
-        content.and_then(|content| common::lookup_datacenter_config_key(&content, "http_proxy"))
+        content
+            .and_then(|content| common::lookup_datacenter_config_key(&content, "http_proxy"))
+            .map(|url| ProxyConfig::parse_proxy_url(&url))
+            .transpose()
+            .map_err(Into::into)
     }
 
     fn default_config(&self) -> &'static SectionConfigData<ConfigEntity> {
diff --git a/proxmox-notify/src/context/test.rs b/proxmox-notify/src/context/test.rs
index 2e230464b..6061e8c4d 100644
--- a/proxmox-notify/src/context/test.rs
+++ b/proxmox-notify/src/context/test.rs
@@ -1,5 +1,6 @@
 use std::sync::OnceLock;
 
+use proxmox_http::ProxyConfig;
 use proxmox_section_config::typed::SectionConfigData;
 
 use crate::Context;
@@ -31,8 +32,8 @@ impl ContextImpl for TestContext {
         "root".into()
     }
 
-    fn http_proxy_config(&self) -> Option<String> {
-        None
+    fn proxy_config(&self) -> Result<Option<ProxyConfig>, BoxedError> {
+        Ok(None)
     }
 
     fn default_config(&self) -> &'static SectionConfigData<ConfigEntity> {
diff --git a/proxmox-notify/src/endpoints/gotify.rs b/proxmox-notify/src/endpoints/gotify.rs
index 5341f822f..cf7d4cc68 100644
--- a/proxmox-notify/src/endpoints/gotify.rs
+++ b/proxmox-notify/src/endpoints/gotify.rs
@@ -4,7 +4,7 @@ use std::time::Duration;
 use serde_json::json;
 
 use proxmox_http::client::sync::Client;
-use proxmox_http::{HttpClient, HttpOptions, ProxyConfig};
+use proxmox_http::{HttpClient, HttpOptions};
 
 use crate::api_types::{GotifyConfig, GotifyPrivateConfig};
 use crate::renderer::TemplateType;
@@ -83,9 +83,7 @@ impl Endpoint for GotifyEndpoint {
         ]);
 
         let proxy_config = context
-            .http_proxy_config()
-            .map(|url| ProxyConfig::parse_proxy_url(&url))
-            .transpose()
+            .proxy_config()
             .map_err(|err| Error::invalid_config_with_source("invalid proxy configuration", err))?;
 
         let options = HttpOptions {
diff --git a/proxmox-notify/src/endpoints/webhook.rs b/proxmox-notify/src/endpoints/webhook.rs
index 49ea29c1e..da2e189b4 100644
--- a/proxmox-notify/src/endpoints/webhook.rs
+++ b/proxmox-notify/src/endpoints/webhook.rs
@@ -18,7 +18,7 @@ use percent_encoding::AsciiSet;
 use serde_json::{Map, Value, json};
 
 use proxmox_http::client::sync::Client;
-use proxmox_http::{HttpClient, HttpOptions, ProxyConfig};
+use proxmox_http::{HttpClient, HttpOptions};
 
 use crate::api_types::{HttpMethod, WebhookConfig, WebhookPrivateConfig};
 use crate::renderer::TemplateType;
@@ -61,9 +61,7 @@ impl Endpoint for WebhookEndpoint {
 impl WebhookEndpoint {
     fn create_client(&self, context: &Context) -> Result<Client, Error> {
         let proxy_config = context
-            .http_proxy_config()
-            .map(|url| ProxyConfig::parse_proxy_url(&url))
-            .transpose()
+            .proxy_config()
             .map_err(|err| Error::invalid_config_with_source("invalid proxy configuration", err))?;
 
         let options = HttpOptions {
-- 
2.47.3





  parent reply	other threads:[~2026-11-18  9:48 UTC|newest]

Thread overview: 66+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-11-18  9:42 [PATCH many v2 00/63] notify: maintenance, PDM preparations, queue + worker Lukas Wagner
2026-11-18  9:42 ` [PATCH proxmox v2 01/63] notify: disallow `unsafe` code Lukas Wagner
2026-11-18  9:42 ` [PATCH proxmox v2 02/63] notify: refactor error type Lukas Wagner
2026-11-18  9:42 ` [PATCH proxmox v2 03/63] notify: move `Endpoint` trait to endpoint module as pub(crate) Lukas Wagner
2026-11-18  9:42 ` [PATCH proxmox v2 04/63] notify: use ConfigDigest instead of raw byte arrays Lukas Wagner
2026-11-18  9:42 ` [PATCH proxmox v2 05/63] notify: remove static context and pass context as parameter Lukas Wagner
2026-11-18  9:42 ` [PATCH proxmox v2 06/63] notify: matcher: drop unused field matcher verifiers Lukas Wagner
2026-11-18  9:42 ` [PATCH proxmox v2 07/63] notify: introduce 'send-impl', 'api-impl' and 'api-types' features Lukas Wagner
2026-11-18  9:42 ` [PATCH proxmox v2 08/63] notify: matcher: make matcher validation methods public Lukas Wagner
2026-11-18  9:42 ` [PATCH proxmox v2 09/63] notify: matcher: stub CalendarMatcher::matches on wasm32 Lukas Wagner
2026-11-18  9:42 ` [PATCH proxmox v2 10/63] notify: make SendmailEndpoint and SmtpEndpoint private types Lukas Wagner
2026-11-18  9:42 ` [PATCH proxmox v2 11/63] notify: move `send`, `test_target` and `Bus` to new `send` module Lukas Wagner
2026-11-18  9:42 ` [PATCH proxmox v2 12/63] notify: move Origin type to api_types module Lukas Wagner
2026-11-18  9:42 ` [PATCH proxmox v2 13/63] notify: move Target " Lukas Wagner
2026-11-18  9:42 ` [PATCH proxmox v2 14/63] notify: move Config to config module Lukas Wagner
2026-11-18  9:42 ` [PATCH proxmox v2 15/63] notify: move Notification and sub-types to `notification` module Lukas Wagner
2026-11-18  9:43 ` [PATCH proxmox v2 16/63] notify: move schema module to api_types Lukas Wagner
2026-11-18  9:43 ` [PATCH proxmox v2 17/63] notify: move check_matches from api_types::matcher to send::Bus Lukas Wagner
2026-11-18  9:43 ` [PATCH proxmox v2 18/63] notify: move TemplateSource to context module Lukas Wagner
2026-11-18  9:43 ` [PATCH proxmox v2 19/63] notify: config: cleanup helper names and visibility Lukas Wagner
2026-11-18  9:43 ` [PATCH proxmox v2 20/63] notify: config: rename section config parser/writer methods Lukas Wagner
2026-11-18  9:43 ` [PATCH proxmox v2 21/63] notify: config: pass builtins explicitly when parsing section config Lukas Wagner
2026-11-18  9:43 ` [PATCH proxmox v2 22/63] notify: implement PartialEq for all Config types Lukas Wagner
2026-11-18  9:43 ` [PATCH proxmox v2 23/63] notify: use typed SectionConfigData Lukas Wagner
2026-11-18  9:43 ` [PATCH proxmox v2 24/63] notify: api: api types: rename Deleteable* -> Deletable* Lukas Wagner
2026-11-18  9:43 ` [PATCH proxmox v2 25/63] notify: context: parse builtin config only once Lukas Wagner
2026-11-18  9:43 ` Lukas Wagner [this message]
2026-11-18  9:43 ` [PATCH proxmox v2 27/63] notify: gate sub-modules with the appropriate feature flags Lukas Wagner
2026-11-18  9:43 ` [PATCH proxmox v2 28/63] notify: fold mail-forwarder feature into send-impl Lukas Wagner
2026-11-18  9:43 ` [PATCH proxmox v2 29/63] notify: forwarded mails: don't hardcode severity and metadata fields Lukas Wagner
2026-11-18  9:43 ` [PATCH proxmox v2 30/63] notify: don't pass uid when instantiating forwarded mail notifications Lukas Wagner
2026-11-18  9:43 ` [PATCH proxmox v2 31/63] notify: derive PartialEq for Notification type Lukas Wagner
2026-11-18  9:43 ` [PATCH proxmox v2 32/63] notify: add getters for severity and fields on " Lukas Wagner
2026-11-18  9:43 ` [PATCH proxmox v2 33/63] notify: add test suite for " Lukas Wagner
2026-11-18  9:43 ` [PATCH proxmox v2 34/63] notify: serialize raw, forwarded mail content as base64 Lukas Wagner
2026-11-18  9:43 ` [PATCH proxmox v2 35/63] notify: unify code paths for legacy-sendmail and regular notifications Lukas Wagner
2026-11-18  9:43 ` [PATCH proxmox v2 36/63] notify: add backwards-compat note to Notification type Lukas Wagner
2026-11-18  9:43 ` [PATCH proxmox v2 37/63] notify: remove 'test_target' API Lukas Wagner
2026-11-18  9:43 ` [PATCH proxmox v2 38/63] notify: replace notification instantiation with builder pattern Lukas Wagner
2026-11-18  9:43 ` [PATCH proxmox v2 39/63] notify: add send receipts Lukas Wagner
2026-11-18  9:43 ` [PATCH proxmox v2 40/63] notify: make sure that template name matches SAFE_ID_REGEX Lukas Wagner
2026-11-18  9:43 ` [PATCH proxmox v2 41/63] notify: implement notification queue submitter Lukas Wagner
2026-11-18  9:43 ` [PATCH proxmox v2 42/63] notify: context: add read_config Lukas Wagner
2026-11-18  9:43 ` [PATCH proxmox v2 43/63] notify: queue: add queue consumer Lukas Wagner
2026-11-18  9:43 ` [PATCH proxmox v2 44/63] notify: queue: add worker task Lukas Wagner
2026-11-18  9:43 ` [PATCH proxmox-backup v2 45/63] notifications: don't ignore verification errors in legacy-sendmail mode Lukas Wagner
2026-11-18  9:43 ` [PATCH proxmox-backup v2 46/63] notifications: adapt to proxmox-notify API changes Lukas Wagner
2026-11-18  9:43 ` [PATCH proxmox-backup v2 47/63] api: notification: send test notification via proxmox_notify::send Lukas Wagner
2026-11-18  9:43 ` [PATCH proxmox-backup v2 48/63] notifications: send all notifications via proxmox-notify's queue Lukas Wagner
2026-11-18  9:43 ` [PATCH proxmox-perl-rs v2 49/63] pve: notify: adapt to changes in the public API of proxmox-notify Lukas Wagner
2026-11-18  9:43 ` [PATCH proxmox-perl-rs v2 50/63] pve: notify: add `PVE::RS::Notify::enqueue` method Lukas Wagner
2026-11-18  9:43 ` [PATCH pve-cluster v2 51/63] notify: send notifications via notification queue Lukas Wagner
2026-11-18  9:43 ` [PATCH manager v2 52/63] vzdump: send legacy-sendmail notifications via simplified API Lukas Wagner
2026-11-18  9:43 ` [PATCH manager v2 53/63] debian: create notification queue directory via tmpfiles Lukas Wagner
2026-11-18  9:43 ` [PATCH manager v2 54/63] debian: add 'pve-notify-worker' as dependecy Lukas Wagner
2026-11-18  9:43 ` [PATCH manager v2 55/63] api: services: add 'pve-notify-worker' as known service Lukas Wagner
2026-11-18  9:43 ` [PATCH manager v2 56/63] services: request pve-notify-worker.service via Wants Lukas Wagner
2026-11-18  9:43 ` [PATCH proxmox-mail-forward v2 57/63] forward mails via notification queue Lukas Wagner
2026-11-18  9:43 ` [PATCH proxmox-mail-forward v2 58/63] use return code to signal permanent or temporary failure Lukas Wagner
2026-11-18  9:43 ` [PATCH proxmox-mail-forward v2 59/63] limit size of mail read from stdin Lukas Wagner
2026-11-18  9:43 ` [PATCH proxmox-mail-forward v2 60/63] cargo: move mail forwarder into a workspace member crate Lukas Wagner
2026-11-18  9:43 ` [PATCH proxmox-mail-forward v2 61/63] add crate for code shared between the mail-forwarder and the worker Lukas Wagner
2026-11-18  9:43 ` [PATCH proxmox-mail-forward v2 62/63] add pve-notify-worker crate and package Lukas Wagner
2026-11-18  9:43 ` [PATCH proxmox-mail-forward v2 63/63] debian: add versioned break for pve-manager and proxmox-backup-server Lukas Wagner
2026-11-18 21:44 ` [PATCH many v2 00/63] notify: maintenance, PDM preparations, queue + worker Thomas Lamprecht
2026-11-19 10:45   ` Lukas Wagner

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=20261118094348.273646-27-l.wagner@proxmox.com \
    --to=l.wagner@proxmox.com \
    --cc=pve-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
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal