extern/nushell
1
0
Fork 1
mirror of https://github.com/nushell/nushell.git synced 2025-04-03 06:01:11 +02:00
Code Issues Packages Projects Releases Wiki Activity

Add support for HTTP proxy in network commands (#10401)

Browse Source 
Closes https://github.com/nushell/nushell/issues/8847

# Description

If the `HTTP_PROXY` variable is found, use its value to setup ureq
proxy. I haven't implemented `NO_PROXY` at the moment.

# User-Facing Changes

No breaking change for the user, the network commands simply use an
environment variable.

# Tests + Formatting

The existing tests seem to run fine, although I can't think of a new
test to add.
This commit is contained in:
fnuttens 2023-09-27 09:43:34 +02:00 committed by GitHub
parent 6c026242d4
commit 8f4ea69c22
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
crates/nu-command/src/network/http/client.rs
View File

@ -34,10 +34,17 @@ pub fn http_client(allow_insecure: bool) -> ureq::Agent {
.build() .build()
.expect("Failed to build network tls"); .expect("Failed to build network tls");
ureq::builder() let mut agent_builder = ureq::builder()
.user_agent("nushell") .user_agent("nushell")
.tls_connector(std::sync::Arc::new(tls)) .tls_connector(std::sync::Arc::new(tls));
.build()
if let Some(http_proxy) = retrieve_http_proxy_from_env() {
if let Ok(proxy) = ureq::Proxy::new(http_proxy) {
agent_builder = agent_builder.proxy(proxy);
}
};
agent_builder.build()
} }
pub fn http_parse_url( pub fn http_parse_url(
@ -639,3 +646,11 @@ pub fn request_handle_response_headers(
}, },
} }
} }
fn retrieve_http_proxy_from_env() -> Option<String> {
std::env::vars()
.find(|(key, _)| key == "http_proxy")
.or(std::env::vars().find(|(key, _)| key == "HTTP_PROXY"))
.or(std::env::vars().find(|(key, _)| key == "ALL_PROXY"))
.map(|(_, value)| value)
}