Mirrors/nushell
2
0
Fork 0
mirror of https://github.com/nushell/nushell synced 2024-12-29 06:23:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

Don't panic when http_client fails (#11422)

Browse source 
# Description

This PR makes `http_client` return `Result<ureq::Agent, ShellError>`, so
errors can be propagated to the caller.
This commit is contained in:
nibon7 2023-12-25 23:09:37 +08:00 committed by GitHub
parent 534287ed65
commit 34f3da7150
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 16 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
crates/nu-command/src/network/http/client.rs
View file

@ -26,17 +26,21 @@ pub enum BodyType {
Unknown, Unknown,
} }
// Only panics if the user agent is invalid but we define it statically so either
// it always or never fails
pub fn http_client( pub fn http_client(
allow_insecure: bool, allow_insecure: bool,
engine_state: &EngineState, engine_state: &EngineState,
stack: &mut Stack, stack: &mut Stack,
) -> ureq::Agent { ) -> Result<ureq::Agent, ShellError> {
let tls = native_tls::TlsConnector::builder() let tls = native_tls::TlsConnector::builder()
.danger_accept_invalid_certs(allow_insecure) .danger_accept_invalid_certs(allow_insecure)
.build() .build()
.expect("Failed to build network tls"); .map_err(|e| ShellError::GenericError {
error: format!("Failed to build network tls: {}", e),
msg: String::new(),
span: None,
help: None,
inner: vec![],
})?;
let mut agent_builder = ureq::builder() let mut agent_builder = ureq::builder()
.user_agent("nushell") .user_agent("nushell")
@ -48,7 +52,7 @@ pub fn http_client(
} }
}; };
agent_builder.build() Ok(agent_builder.build())
} }
pub fn http_parse_url( pub fn http_parse_url(

2
crates/nu-command/src/network/http/delete.rs
View file

@ -187,7 +187,7 @@ fn helper(
let ctrl_c = engine_state.ctrlc.clone(); let ctrl_c = engine_state.ctrlc.clone();
let (requested_url, _) = http_parse_url(call, span, args.url)?; let (requested_url, _) = http_parse_url(call, span, args.url)?;
let client = http_client(args.insecure, engine_state, stack); let client = http_client(args.insecure, engine_state, stack)?;
let mut request = client.delete(&requested_url); let mut request = client.delete(&requested_url);
request = request_set_timeout(args.timeout, request)?; request = request_set_timeout(args.timeout, request)?;

2
crates/nu-command/src/network/http/get.rs
View file

@ -171,7 +171,7 @@ fn helper(
let ctrl_c = engine_state.ctrlc.clone(); let ctrl_c = engine_state.ctrlc.clone();
let (requested_url, _) = http_parse_url(call, span, args.url)?; let (requested_url, _) = http_parse_url(call, span, args.url)?;
let client = http_client(args.insecure, engine_state, stack); let client = http_client(args.insecure, engine_state, stack)?;
let mut request = client.get(&requested_url); let mut request = client.get(&requested_url);
request = request_set_timeout(args.timeout, request)?; request = request_set_timeout(args.timeout, request)?;

2
crates/nu-command/src/network/http/head.rs
View file

@ -147,7 +147,7 @@ fn helper(
let span = args.url.span(); let span = args.url.span();
let (requested_url, _) = http_parse_url(call, span, args.url)?; let (requested_url, _) = http_parse_url(call, span, args.url)?;
let client = http_client(args.insecure, engine_state, stack); let client = http_client(args.insecure, engine_state, stack)?;
let mut request = client.head(&requested_url); let mut request = client.head(&requested_url);
request = request_set_timeout(args.timeout, request)?; request = request_set_timeout(args.timeout, request)?;

2
crates/nu-command/src/network/http/options.rs
View file

@ -160,7 +160,7 @@ fn helper(
let ctrl_c = engine_state.ctrlc.clone(); let ctrl_c = engine_state.ctrlc.clone();
let (requested_url, _) = http_parse_url(call, span, args.url)?; let (requested_url, _) = http_parse_url(call, span, args.url)?;
let client = http_client(args.insecure, engine_state, stack); let client = http_client(args.insecure, engine_state, stack)?;
let mut request = client.request("OPTIONS", &requested_url); let mut request = client.request("OPTIONS", &requested_url);
request = request_set_timeout(args.timeout, request)?; request = request_set_timeout(args.timeout, request)?;

2
crates/nu-command/src/network/http/patch.rs
View file

@ -179,7 +179,7 @@ fn helper(
let ctrl_c = engine_state.ctrlc.clone(); let ctrl_c = engine_state.ctrlc.clone();
let (requested_url, _) = http_parse_url(call, span, args.url)?; let (requested_url, _) = http_parse_url(call, span, args.url)?;
let client = http_client(args.insecure, engine_state, stack); let client = http_client(args.insecure, engine_state, stack)?;
let mut request = client.patch(&requested_url); let mut request = client.patch(&requested_url);
request = request_set_timeout(args.timeout, request)?; request = request_set_timeout(args.timeout, request)?;

2
crates/nu-command/src/network/http/post.rs
View file

@ -177,7 +177,7 @@ fn helper(
let ctrl_c = engine_state.ctrlc.clone(); let ctrl_c = engine_state.ctrlc.clone();
let (requested_url, _) = http_parse_url(call, span, args.url)?; let (requested_url, _) = http_parse_url(call, span, args.url)?;
let client = http_client(args.insecure, engine_state, stack); let client = http_client(args.insecure, engine_state, stack)?;
let mut request = client.post(&requested_url); let mut request = client.post(&requested_url);
request = request_set_timeout(args.timeout, request)?; request = request_set_timeout(args.timeout, request)?;

2
crates/nu-command/src/network/http/put.rs
View file

@ -177,7 +177,7 @@ fn helper(
let ctrl_c = engine_state.ctrlc.clone(); let ctrl_c = engine_state.ctrlc.clone();
let (requested_url, _) = http_parse_url(call, span, args.url)?; let (requested_url, _) = http_parse_url(call, span, args.url)?;
let client = http_client(args.insecure, engine_state, stack); let client = http_client(args.insecure, engine_state, stack)?;
let mut request = client.put(&requested_url); let mut request = client.put(&requested_url);
request = request_set_timeout(args.timeout, request)?; request = request_set_timeout(args.timeout, request)?;