From: Wolfgang Bumiller <w.bumiller@proxmox.com>
To: Mira Limbeck <m.limbeck@proxmox.com>
Cc: pve-devel@lists.proxmox.com
Subject: Re: [pve-devel] [PATCH proxmox-openid-rs] add http proxy support
Date: Mon, 21 Mar 2022 15:58:11 +0100 [thread overview]
Message-ID: <20220321145811.h73o3lnukbkntvou@olga.proxmox.com> (raw)
In-Reply-To: <20220321132454.3959858-1-m.limbeck@proxmox.com>
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 <m.limbeck@proxmox.com>
> ---
> 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<ureq::Agent, Error> {
> - 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
prev parent reply other threads:[~2022-03-21 14:58 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-03-21 13:24 Mira Limbeck
2022-03-21 14:58 ` Wolfgang Bumiller [this message]
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=20220321145811.h73o3lnukbkntvou@olga.proxmox.com \
--to=w.bumiller@proxmox.com \
--cc=m.limbeck@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