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 103A168B5F for ; Mon, 21 Mar 2022 15:58:14 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 06C494EC4 for ; Mon, 21 Mar 2022 15:58:14 +0100 (CET) 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 id 815144EBA for ; Mon, 21 Mar 2022 15:58:13 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 502D442DF5 for ; Mon, 21 Mar 2022 15:58:13 +0100 (CET) Date: Mon, 21 Mar 2022 15:58:11 +0100 From: Wolfgang Bumiller To: Mira Limbeck Cc: pve-devel@lists.proxmox.com Message-ID: <20220321145811.h73o3lnukbkntvou@olga.proxmox.com> References: <20220321132454.3959858-1-m.limbeck@proxmox.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20220321132454.3959858-1-m.limbeck@proxmox.com> X-SPAM-LEVEL: Spam detection results: 0 AWL 0.352 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% 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: Re: [pve-devel] [PATCH proxmox-openid-rs] add http 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: Mon, 21 Mar 2022 14:58:14 -0000 On Mon, Mar 21, 2022 at 02:24:54PM +0100, Mira Limbeck wrote: > ureq has support for a HTTP proxy, but no support for HTTPS proxy yet. > > ureq doesn't query `all_proxy` and `ALL_PROXY` environment variables by > itself the way curl does. So set the proxy in code if any of the above > environment variables are set. > > Signed-off-by: Mira Limbeck > --- > src/http_client.rs | 15 ++++++++++++--- > 1 file changed, 12 insertions(+), 3 deletions(-) > > diff --git a/src/http_client.rs b/src/http_client.rs > index 5cceafb..a732a98 100644 > --- a/src/http_client.rs > +++ b/src/http_client.rs > @@ -40,9 +40,18 @@ pub enum Error { > } > > fn ureq_agent() -> Result { > - Ok(ureq::AgentBuilder::new() > - .tls_connector(Arc::new(native_tls::TlsConnector::new()?)) > - .build()) > + let mut agent = > + ureq::AgentBuilder::new().tls_connector(Arc::new(native_tls::TlsConnector::new()?)); > + if let Ok(val) = std::env::var("all_proxy") { Just add .or_else(|_| std::env::var("ALL_PROXY")) to the query instead of duplicating the body ;-) > + let proxy = ureq::Proxy::new(val).map_err(Box::new)?; > + agent = agent.proxy(proxy); > + } else if let Ok(val) = std::env::var("ALL_PROXY") { since this is identical code: > + let proxy = ureq::Proxy::new(val).map_err(Box::new)?; > + agent = agent.proxy(proxy); > + } > + > + > + Ok(agent.build()) > } > > /// > -- > 2.30.2