From: Dylan Whyte <d.whyte@proxmox.com>
To: pbs-devel@lists.proxmox.com
Subject: [pbs-devel] [PATCH proxmox-backup] fix #3296: allow set subscription through proxy
Date: Fri, 19 Mar 2021 14:35:03 +0100 [thread overview]
Message-ID: <20210319133503.5398-1-d.whyte@proxmox.com> (raw)
when setting a subscription key, use http(s)_proxy as tunnel if
evironment variable is set.
Signed-off-by: Dylan Whyte <d.whyte@proxmox.com>
---
* required packages can be found in nasi/iso/packages/hyper-proxy
Note that proxy authorization/authentication is not implemented yet.
hyper-proxy implements it using the 'headers' crate, which we do
not have as a direct dependency. I figured i'd leave it for a
follow up patch, just in case we decide not to use hyper-proxy afterall.
Cargo.toml | 3 ++-
src/tools/http.rs | 30 +++++++++++++++++++++++++++---
2 files changed, 29 insertions(+), 4 deletions(-)
diff --git a/Cargo.toml b/Cargo.toml
index 9483831c..5a8bcc81 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -24,7 +24,7 @@ path = "src/lib.rs"
[dependencies]
apt-pkg-native = "0.3.2"
-base64 = "0.12"
+base64 = "0.13"
bitflags = "1.2.1"
bytes = "1.0"
crc32fast = "1"
@@ -74,6 +74,7 @@ xdg = "2.2"
zstd = { version = "0.4", features = [ "bindgen" ] }
nom = "5.1"
crossbeam-channel = "0.5"
+hyper-proxy = { version = "0.9", default-features = false, features = ["openssl-tls"] }
[features]
default = []
diff --git a/src/tools/http.rs b/src/tools/http.rs
index d08ce451..057f2abb 100644
--- a/src/tools/http.rs
+++ b/src/tools/http.rs
@@ -7,6 +7,7 @@ use std::pin::Pin;
use hyper::{Uri, Body};
use hyper::client::{Client, HttpConnector};
+use hyper_proxy::{Proxy, ProxyConnector, Intercept};
use http::{Request, Response};
use openssl::ssl::{SslConnector, SslMethod};
use futures::*;
@@ -77,10 +78,33 @@ pub async fn post(
.header(hyper::header::CONTENT_TYPE, content_type)
.body(body)?;
+ let mut http_proxy = "".to_string();
+ if let Ok(proxy) = std::env::var("https_proxy") {
+ http_proxy = proxy;
+ } else if let Ok(proxy) = std::env::var("http_proxy") {
+ http_proxy = proxy;
+ }
- HTTP_CLIENT.request(request)
- .map_err(Error::from)
- .await
+ if !http_proxy.is_empty() {
+ let proxy = format!("http://{}/", http_proxy);
+ let proxy = {
+ let proxy_uri = proxy.parse().unwrap();
+ let proxy = Proxy::new(Intercept::All, proxy_uri);
+ let connector = HttpConnector::new();
+ let proxy_connector = ProxyConnector::from_proxy(connector, proxy).unwrap();
+ proxy_connector
+ };
+
+ let client = Client::builder().build(proxy);
+
+ client.request(request)
+ .map_err(Error::from)
+ .await
+ } else {
+ HTTP_CLIENT.request(request)
+ .map_err(Error::from)
+ .await
+ }
}
#[derive(Clone)]
--
2.20.1
next reply other threads:[~2021-03-19 13:35 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-19 13:35 Dylan Whyte [this message]
2021-03-19 15:32 ` Thomas Lamprecht
2021-03-22 8:39 ` Fabian Grünbichler
2021-03-22 9:03 ` Thomas Lamprecht
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=20210319133503.5398-1-d.whyte@proxmox.com \
--to=d.whyte@proxmox.com \
--cc=pbs-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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.