From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [IPv6:2a01:7e0:0:424::9]) by lore.proxmox.com (Postfix) with ESMTPS id 1A7001FF13F for ; Thu, 12 Mar 2026 12:42:58 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 4536012491; Thu, 12 Mar 2026 12:42:54 +0100 (CET) From: Christian Ebner To: pbs-devel@lists.proxmox.com Subject: [PATCH proxmox v3 1/2] http: move http proxy schema from PBS to crate's api types Date: Thu, 12 Mar 2026 12:42:01 +0100 Message-ID: <20260312114208.514373-2-c.ebner@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260312114208.514373-1-c.ebner@proxmox.com> References: <20260312114208.514373-1-c.ebner@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1773315703217 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.057 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment RCVD_IN_MSPIKE_H2 0.001 Average reputation (+2) SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Message-ID-Hash: XAQQQTQBTBRWXPNKNSUJLKYLTEJE5J4I X-Message-ID-Hash: XAQQQTQBTBRWXPNKNSUJLKYLTEJE5J4I X-MailFrom: c.ebner@proxmox.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.10 Precedence: list List-Id: Proxmox Backup Server development discussion List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: The http proxy schema is used in combination with the ProxyConfig for verification, the latter being part of the crate already. Move also the schema to the crate and guard it behind a api-types feature to allow for conditional compilation thereof. This will easy refactoring the node config in PBS. Signed-off-by: Christian Ebner --- proxmox-http/Cargo.toml | 2 ++ proxmox-http/debian/control | 18 ++++++++++++++++++ proxmox-http/src/lib.rs | 8 +++++--- proxmox-http/src/proxy_config.rs | 16 ++++++++++++++++ 4 files changed, 41 insertions(+), 3 deletions(-) diff --git a/proxmox-http/Cargo.toml b/proxmox-http/Cargo.toml index 61a45d1c..f8dde588 100644 --- a/proxmox-http/Cargo.toml +++ b/proxmox-http/Cargo.toml @@ -33,6 +33,7 @@ url = { workspace = true, optional = true } proxmox-async = { workspace = true, optional = true } proxmox-base64 = { workspace = true, optional = true } proxmox-rate-limiter = { workspace = true, optional = true, features = [ "rate-limiter" ] } +proxmox-schema = { workspace = true, optional = true, features = ["api-types"] } proxmox-sys = { workspace = true, optional = true } proxmox-io = { workspace = true, optional = true } proxmox-lang = { workspace = true, optional = true } @@ -89,6 +90,7 @@ client = [ client-sync = [ "client-trait", "http-helpers", "dep:ureq", "dep:native-tls" ] client-trait = [ "dep:http" ] http-helpers = [ "dep:http", "dep:proxmox-base64", "dep:proxmox-sys", "dep:serde_json", "dep:url" ] +api-types = [ "dep:http", "dep:proxmox-schema", "dep:serde_json", "dep:url" ] websocket = [ "dep:futures", "dep:http", diff --git a/proxmox-http/debian/control b/proxmox-http/debian/control index 92daac47..b30c3e61 100644 --- a/proxmox-http/debian/control +++ b/proxmox-http/debian/control @@ -21,6 +21,7 @@ Depends: ${misc:Depends}, librust-anyhow-1+default-dev Suggests: + librust-proxmox-http+api-types-dev (= ${binary:Version}), librust-proxmox-http+body-dev (= ${binary:Version}), librust-proxmox-http+client-dev (= ${binary:Version}), librust-proxmox-http+client-sync-dev (= ${binary:Version}), @@ -40,6 +41,23 @@ Provides: Description: Proxmox HTTP library - Rust source code Source code for Debianized Rust crate "proxmox-http" +Package: librust-proxmox-http+api-types-dev +Architecture: any +Multi-Arch: same +Depends: + ${misc:Depends}, + librust-proxmox-http-dev (= ${binary:Version}), + librust-http-1+default-dev, + librust-proxmox-schema-5+api-types-dev (>= 5.0.1-~~), + librust-proxmox-schema-5+default-dev (>= 5.0.1-~~) +Provides: + librust-proxmox-http-1+api-types-dev (= ${binary:Version}), + librust-proxmox-http-1.0+api-types-dev (= ${binary:Version}), + librust-proxmox-http-1.0.5+api-types-dev (= ${binary:Version}) +Description: Proxmox HTTP library - feature "api-types" + This metapackage enables feature "api-types" for the Rust proxmox-http crate, + by pulling in any additional dependencies needed by that feature. + Package: librust-proxmox-http+body-dev Architecture: any Multi-Arch: same diff --git a/proxmox-http/src/lib.rs b/proxmox-http/src/lib.rs index 406f5b8b..79caa23e 100644 --- a/proxmox-http/src/lib.rs +++ b/proxmox-http/src/lib.rs @@ -5,13 +5,15 @@ #[cfg(feature = "websocket")] pub mod websocket; -#[cfg(feature = "http-helpers")] +#[cfg(any(feature = "http-helpers", feature = "api-types"))] pub mod uri; -#[cfg(feature = "http-helpers")] +#[cfg(any(feature = "http-helpers", feature = "api-types"))] pub mod proxy_config; -#[cfg(feature = "http-helpers")] +#[cfg(any(feature = "http-helpers", feature = "api-types"))] pub use proxy_config::ProxyConfig; +#[cfg(feature = "api-types")] +pub use proxy_config::HTTP_PROXY_SCHEMA; #[cfg(feature = "http-helpers")] mod http_options; diff --git a/proxmox-http/src/proxy_config.rs b/proxmox-http/src/proxy_config.rs index 7ec68998..8bec3acd 100644 --- a/proxmox-http/src/proxy_config.rs +++ b/proxmox-http/src/proxy_config.rs @@ -6,6 +6,9 @@ use anyhow::{bail, format_err, Error}; use http::Uri; +#[cfg(feature = "api-types")] +use proxmox_schema::{ApiStringFormat, Schema, StringSchema}; + use crate::uri::build_authority; /// HTTP Proxy Configuration @@ -88,3 +91,16 @@ impl ProxyConfig { }) } } + +#[cfg(feature = "api-types")] +/// Schema for the http proxy configuration +pub const HTTP_PROXY_SCHEMA: Schema = + StringSchema::new("HTTP proxy configuration [http://][:port]") + .format(&ApiStringFormat::VerifyFn(|s| { + ProxyConfig::parse_proxy_url(s)?; + Ok(()) + })) + .min_length(1) + .max_length(128) + .type_text("[http://][:port]") + .schema(); -- 2.47.3