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 3890BDF5A for ; Mon, 17 Jul 2023 17:09:24 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id EC87510A35 for ; Mon, 17 Jul 2023 17:09:23 +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 ; Mon, 17 Jul 2023 17:09:23 +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 A3B8C42BB8 for ; Mon, 17 Jul 2023 17:01:19 +0200 (CEST) From: Lukas Wagner To: pve-devel@lists.proxmox.com Date: Mon, 17 Jul 2023 17:00:17 +0200 Message-Id: <20230717150051.710464-33-l.wagner@proxmox.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230717150051.710464-1-l.wagner@proxmox.com> References: <20230717150051.710464-1-l.wagner@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.110 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 v3 proxmox-perl-rs 32/66] notify: add context for getting http_proxy from datacenter.cfg 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: Mon, 17 Jul 2023 15:09:24 -0000 Signed-off-by: Lukas Wagner --- pve-rs/src/notify.rs | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pve-rs/src/notify.rs b/pve-rs/src/notify.rs index 04e902c..0c00b03 100644 --- a/pve-rs/src/notify.rs +++ b/pve-rs/src/notify.rs @@ -60,6 +60,11 @@ impl Context for PVEContext { .and_then(|content| lookup_datacenter_config_key(&content, "mail_from")) .unwrap_or_else(|| String::from("root")) } + + fn http_proxy_config(&self) -> Option { + let content = attempt_file_read("/etc/pve/datacenter.cfg"); + content.and_then(|content| lookup_datacenter_config_key(&content, "http_proxy")) + } } #[cfg(test)] @@ -87,6 +92,7 @@ user:no-mail@pve:1:0:::::: const DC_CONFIG: &str = " email_from: user@example.com +http_proxy: http://localhost:1234 keyboard: en-us "; #[test] @@ -95,6 +101,11 @@ keyboard: en-us lookup_datacenter_config_key(DC_CONFIG, "email_from"), Some("user@example.com".to_string()) ); + assert_eq!( + lookup_datacenter_config_key(DC_CONFIG, "http_proxy"), + Some("http://localhost:1234".to_string()) + ); + assert_eq!(lookup_datacenter_config_key(DC_CONFIG, "foo"), None); } } -- 2.39.2