From: Lukas Wagner <l.wagner@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [PATCH proxmox 25/55] notify: context: parse proxy config in trait impl, not at the callsite
Date: Fri, 13 Nov 2026 16:07:58 +0100 [thread overview]
Message-ID: <20261113150828.756836-26-l.wagner@proxmox.com> (raw)
In-Reply-To: <20261113150828.756836-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
next prev parent reply other threads:[~2026-11-13 15:15 UTC|newest]
Thread overview: 58+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-11-13 15:07 [PATCH many 00/55] notify: maintenance, PDM preparations, queue + worker Lukas Wagner
2026-11-13 15:07 ` [PATCH proxmox 01/55] notify: disallow `unsafe` code Lukas Wagner
2026-11-13 15:07 ` [PATCH proxmox 02/55] notify: refactor error type Lukas Wagner
2026-11-13 15:07 ` [PATCH proxmox 03/55] notify: move `Endpoint` trait to endpoint module as pub(crate) Lukas Wagner
2026-11-13 15:07 ` [PATCH proxmox 04/55] notify: use ConfigDigest instead of raw byte arrays Lukas Wagner
2026-11-13 15:07 ` [PATCH proxmox 05/55] notify: remove static context and pass context as parameter Lukas Wagner
2026-11-13 15:07 ` [PATCH proxmox 06/55] notify: matcher: drop unused field matcher verifiers Lukas Wagner
2026-11-13 15:07 ` [PATCH proxmox 07/55] notify: introduce 'send-impl', 'api-impl' and 'api-types' features Lukas Wagner
2026-11-13 15:07 ` [PATCH proxmox 08/55] notify: matcher: make matcher validation methods public Lukas Wagner
2026-11-13 15:07 ` [PATCH proxmox 09/55] notify: make SendmailEndpoint and SmtpEndpoint private types Lukas Wagner
2026-11-13 15:07 ` [PATCH proxmox 10/55] notify: move `send`, `test_target` and `Bus` to new `send` module Lukas Wagner
2026-11-13 15:07 ` [PATCH proxmox 11/55] notify: move Origin type to api_types module Lukas Wagner
2026-11-13 15:07 ` [PATCH proxmox 12/55] notify: move Target " Lukas Wagner
2026-11-13 15:07 ` [PATCH proxmox 13/55] notify: move Config to config module Lukas Wagner
2026-11-13 15:07 ` [PATCH proxmox 14/55] notify: move Notification and sub-types to `notification` module Lukas Wagner
2026-11-13 15:07 ` [PATCH proxmox 15/55] notify: move schema module to api_types Lukas Wagner
2026-11-13 15:07 ` [PATCH proxmox 16/55] notify: move check_matches from api_types::matcher to send::Bus Lukas Wagner
2026-11-13 15:07 ` [PATCH proxmox 17/55] notify: move TemplateSource to context module Lukas Wagner
2026-11-13 15:07 ` [PATCH proxmox 18/55] notify: config: cleanup helpers names and visibility Lukas Wagner
2026-11-13 15:07 ` [PATCH proxmox 19/55] notify: config: rename section config parser/writer methods Lukas Wagner
2026-11-13 15:07 ` [PATCH proxmox 20/55] notify: config: pass builtins explicitly when parsing section config Lukas Wagner
2026-11-13 15:07 ` [PATCH proxmox 21/55] notify: implement PartialEq for all Config types Lukas Wagner
2026-11-13 15:07 ` [PATCH proxmox 22/55] notify: use typed SectionConfigData Lukas Wagner
2026-11-13 15:07 ` [PATCH proxmox 23/55] notify: api: api types: rename Deleteable* -> Deletable* Lukas Wagner
2026-11-13 15:07 ` [PATCH proxmox 24/55] notify: context: parse builtin config only once Lukas Wagner
2026-11-13 15:07 ` Lukas Wagner [this message]
2026-11-13 15:07 ` [PATCH proxmox 26/55] notify: gate sub-modules with the appropriate feature flags Lukas Wagner
2026-11-13 15:08 ` [PATCH proxmox 27/55] notify: fold mail-forwarder feature into send-impl Lukas Wagner
2026-11-13 15:08 ` [PATCH proxmox 28/55] notify: forwarded mails: don't hardcode severity and metadata fields Lukas Wagner
2026-11-13 15:08 ` [PATCH proxmox 29/55] notify: don't pass uid when instantiating forwarded mail notifications Lukas Wagner
2026-11-13 15:08 ` [PATCH proxmox 30/55] notify: derive PartialEq for Notification type Lukas Wagner
2026-11-13 15:08 ` [PATCH proxmox 31/55] notify: add getters for severity and fields on " Lukas Wagner
2026-11-13 15:08 ` [PATCH proxmox 32/55] notify: add test suite for " Lukas Wagner
2026-11-13 15:08 ` [PATCH proxmox 33/55] notify: serialize raw, forwarded mail content as base64 Lukas Wagner
2026-11-13 15:08 ` [PATCH proxmox 34/55] notify: unify code paths for legacy-sendmail and regular notifications Lukas Wagner
2026-11-13 15:08 ` [PATCH proxmox 35/55] notify: add backwards-compat note to Notification type Lukas Wagner
2026-11-13 15:08 ` [PATCH proxmox 36/55] notify: remove 'test_target' API Lukas Wagner
2026-11-13 15:08 ` [PATCH proxmox 37/55] notify: replace notification instantiation with builder pattern Lukas Wagner
2026-11-13 15:08 ` [PATCH proxmox 38/55] notify: add send receipts Lukas Wagner
2026-11-13 15:08 ` [PATCH proxmox 39/55] notify: implement notification queue submitter Lukas Wagner
2026-11-13 15:08 ` [PATCH proxmox 40/55] notify: context: add read_config Lukas Wagner
2026-11-13 15:08 ` [PATCH proxmox 41/55] notify: queue: add queue consumer Lukas Wagner
2026-11-13 15:08 ` [PATCH proxmox 42/55] notify: queue: add worker task Lukas Wagner
2026-11-13 15:08 ` [PATCH proxmox-backup 43/55] notifications: don't ignore verification errors in legacy-sendmail mode Lukas Wagner
2026-11-13 15:08 ` [PATCH proxmox-backup 44/55] notifications: adapt to proxmox-notify API changes Lukas Wagner
2026-11-13 15:08 ` [PATCH proxmox-backup 45/55] api: notification: send test notification via proxmox_notify::send Lukas Wagner
2026-11-13 15:08 ` [PATCH proxmox-backup 46/55] notifications: send all notifications via proxmox-notify's queue Lukas Wagner
2026-11-13 15:08 ` [PATCH proxmox-perl-rs 47/55] pve: notify: adapt to changes in the public API of proxmox-notify Lukas Wagner
2026-11-13 15:08 ` [PATCH proxmox-perl-rs 48/55] pve: notify: add `PVE::RS::Notify::enqueue` method Lukas Wagner
2026-11-13 15:08 ` [PATCH pve-cluster 49/55] notify: send notifications via notification queue Lukas Wagner
2026-11-13 15:08 ` [PATCH manager 50/55] vzdump: send legacy-sendmail notifications via simplified API Lukas Wagner
2026-11-13 15:08 ` [PATCH manager 51/55] pve-notify-worker: add new rust-based notification worker daemon Lukas Wagner
2026-11-13 15:08 ` [PATCH manager 52/55] debian: add 'pve-notify-worker' as a dependency Lukas Wagner
2026-11-13 15:08 ` [PATCH proxmox-mail-forward 53/55] forward mails via notification queue Lukas Wagner
2026-11-13 15:08 ` [PATCH proxmox-mail-forward 54/55] use return code to signal permanent or temporary failure Lukas Wagner
2026-11-13 15:08 ` [PATCH proxmox-mail-forward 55/55] limit size of mail read from stdin Lukas Wagner
2026-11-17 9:35 ` [PATCH many 00/55] notify: maintenance, PDM preparations, queue + worker Lukas Wagner
2026-11-18 9:55 ` superseded: " 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=20261113150828.756836-26-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