From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 2A88AF0B5 for ; Thu, 20 Jul 2023 16:33:42 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 40D92148F7 for ; Thu, 20 Jul 2023 16:33:08 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Thu, 20 Jul 2023 16:33:06 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 1BFE441FB0 for ; Thu, 20 Jul 2023 16:33:06 +0200 (CEST) From: Lukas Wagner To: pve-devel@lists.proxmox.com Date: Thu, 20 Jul 2023 16:31:47 +0200 Message-Id: <20230720143236.652292-21-l.wagner@proxmox.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230720143236.652292-1-l.wagner@proxmox.com> References: <20230720143236.652292-1-l.wagner@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.096 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 SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record T_SCC_BODY_TEXT_LINE -0.01 - Subject: [pve-devel] [PATCH v4 proxmox 20/69] notify: gotify: add proxy support X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 20 Jul 2023 14:33:42 -0000 The proxy configuration will be read from datacenter.cfg via a new method of the `Context` trait. Signed-off-by: Lukas Wagner --- proxmox-notify/src/context.rs | 1 + proxmox-notify/src/endpoints/gotify.rs | 22 ++++++++++++++++------ 2 files changed, 17 insertions(+), 6 deletions(-) diff --git a/proxmox-notify/src/context.rs b/proxmox-notify/src/context.rs index 4643f987..72e07d5b 100644 --- a/proxmox-notify/src/context.rs +++ b/proxmox-notify/src/context.rs @@ -5,6 +5,7 @@ pub trait Context: Send + Sync + Debug { fn lookup_email_for_user(&self, user: &str) -> Option; fn default_sendmail_author(&self) -> String; fn default_sendmail_from(&self) -> String; + fn http_proxy_config(&self) -> Option; } static CONTEXT: OnceCell<&'static dyn Context> = OnceCell::new(); diff --git a/proxmox-notify/src/endpoints/gotify.rs b/proxmox-notify/src/endpoints/gotify.rs index 15fb82cf..c1f122dc 100644 --- a/proxmox-notify/src/endpoints/gotify.rs +++ b/proxmox-notify/src/endpoints/gotify.rs @@ -8,8 +8,9 @@ use proxmox_schema::api_types::COMMENT_SCHEMA; use serde::{Deserialize, Serialize}; use serde_json::json; +use crate::context::context; use proxmox_http::client::sync::Client; -use proxmox_http::{HttpClient, HttpOptions}; +use proxmox_http::{HttpClient, HttpOptions, ProxyConfig}; use proxmox_schema::{api, Updater}; fn severity_to_priority(level: Severity) -> u32 { @@ -84,11 +85,6 @@ pub enum DeleteableGotifyProperty { impl Endpoint for GotifyEndpoint { fn send(&self, notification: &Notification) -> Result<(), Error> { - // TODO: What about proxy configuration? - let client = Client::new(HttpOptions::default()); - - let uri = format!("{}/message", self.config.server); - let properties = notification.properties.as_ref(); let title = renderer::render_template( @@ -121,6 +117,20 @@ impl Endpoint for GotifyEndpoint { format!("Bearer {}", self.private_config.token), )]); + let proxy_config = context() + .http_proxy_config() + .map(|url| ProxyConfig::parse_proxy_url(&url)) + .transpose() + .map_err(|err| Error::NotifyFailed(self.name().to_string(), err.into()))?; + + let options = HttpOptions { + proxy_config, + ..Default::default() + }; + + let client = Client::new(options); + let uri = format!("{}/message", self.config.server); + client .post( &uri, -- 2.39.2