forked from Proxmox/proxmox
http: takeover ProxyConfig from proxmox_backup
adapted to use moved build_authority helper. Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
This commit is contained in:
parent
f305be9583
commit
7f56e0774c
@ -27,5 +27,5 @@ proxmox = { path = "../proxmox", optional = true, version = "0.11.3", default-fe
|
||||
default = []
|
||||
|
||||
client = [ "http-helpers" ]
|
||||
http-helpers = [ "http", "hyper", "tokio/io-util", "tokio-openssl" ]
|
||||
http-helpers = [ "base64", "http", "hyper", "tokio/io-util", "tokio-openssl", "proxmox" ]
|
||||
websocket = [ "base64", "futures", "hyper", "openssl", "proxmox/tokio", "tokio/io-util", "tokio/sync" ]
|
||||
|
@ -1,5 +1,7 @@
|
||||
mod wrapper;
|
||||
|
||||
pub use wrapper::MaybeTlsStream;
|
||||
|
||||
pub mod helpers;
|
||||
|
||||
mod proxy_config;
|
||||
pub use proxy_config::ProxyConfig;
|
||||
|
84
proxmox-http/src/http/proxy_config.rs
Normal file
84
proxmox-http/src/http/proxy_config.rs
Normal file
@ -0,0 +1,84 @@
|
||||
use anyhow::{Error, format_err, bail};
|
||||
|
||||
use http::Uri;
|
||||
|
||||
use crate::http::helpers;
|
||||
|
||||
/// HTTP Proxy Configuration
|
||||
#[derive(Clone)]
|
||||
pub struct ProxyConfig {
|
||||
pub host: String,
|
||||
pub port: u16,
|
||||
pub authorization: Option<String>, // user:pass
|
||||
pub force_connect: bool,
|
||||
}
|
||||
|
||||
impl ProxyConfig {
|
||||
/// Parse proxy config from ALL_PROXY environment var
|
||||
pub fn from_proxy_env() -> Result<Option<ProxyConfig>, Error> {
|
||||
|
||||
// We only support/use ALL_PROXY environment
|
||||
|
||||
match std::env::var_os("ALL_PROXY") {
|
||||
None => return Ok(None),
|
||||
Some(all_proxy) => {
|
||||
let all_proxy = match all_proxy.to_str() {
|
||||
Some(s) => String::from(s),
|
||||
None => bail!("non UTF-8 content in env ALL_PROXY"),
|
||||
};
|
||||
if all_proxy.is_empty() {
|
||||
return Ok(None);
|
||||
}
|
||||
let config = Self::parse_proxy_url(&all_proxy)?;
|
||||
Ok(Some(config))
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// Parse proxy configuration string [http://]<host>[:port]
|
||||
///
|
||||
/// Default port is 1080 (like curl)
|
||||
pub fn parse_proxy_url(http_proxy: &str) -> Result<ProxyConfig, Error> {
|
||||
proxmox::try_block!({
|
||||
let proxy_uri: Uri = http_proxy.parse()?;
|
||||
let proxy_authority = match proxy_uri.authority() {
|
||||
Some(authority) => authority,
|
||||
None => bail!("missing proxy authority"),
|
||||
};
|
||||
let host = proxy_authority.host().to_owned();
|
||||
let port = match proxy_uri.port() {
|
||||
Some(port) => port.as_u16(),
|
||||
None => 1080, // CURL default port
|
||||
};
|
||||
|
||||
match proxy_uri.scheme_str() {
|
||||
Some("http") => { /* Ok */ }
|
||||
Some(scheme) => bail!("unsupported proxy scheme '{}'", scheme),
|
||||
None => { /* assume HTTP */ }
|
||||
}
|
||||
|
||||
let authority_vec: Vec<&str> = proxy_authority.as_str().rsplitn(2, '@').collect();
|
||||
let authorization = if authority_vec.len() == 2 {
|
||||
Some(authority_vec[1].to_string())
|
||||
} else {
|
||||
None
|
||||
};
|
||||
|
||||
Ok(ProxyConfig {
|
||||
host,
|
||||
port,
|
||||
authorization,
|
||||
force_connect: false,
|
||||
})
|
||||
}).map_err(|err| format_err!("parse_proxy_url failed: {}", err))
|
||||
}
|
||||
|
||||
/// Assemble canonical proxy string (including scheme and port)
|
||||
pub fn to_proxy_string(&self) -> Result<String, Error> {
|
||||
let authority = helpers::build_authority(&self.host, self.port)?;
|
||||
Ok(match self.authorization {
|
||||
None => format!("http://{}", authority),
|
||||
Some(ref authorization) => format!("http://{}@{}", authorization, authority)
|
||||
})
|
||||
}
|
||||
}
|
Loading…
Reference in New Issue
Block a user