Public/nushell
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed part headers formatting and added Content-Length

Browse Source
This commit is contained in:
Bruce Weirdan 2024-08-04 14:37:51 +02:00
parent fc964074d3
commit efd784353e
No known key found for this signature in database
GPG Key ID: CFC3AAB181751B0D
2 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -281,17 +281,21 @@ pub fn send_request(
for (col, val) in val.into_owned() { for (col, val) in val.into_owned() {
if let Value::Binary { val, .. } = val { if let Value::Binary { val, .. } = val {
let headers = format!( let headers = [
r#"Content-Type: application/octet-stream "Content-Type: application/octet-stream".to_string(),
Content-Disposition: form-data; name="{}"; filename="{}" "Content-Transfer-Encoding: binary".to_string(),
Content-Transfer-Encoding: binary format!(
"#, "Content-Disposition: form-data; name=\"{}\"; filename=\"{}\"",
col, col, col, col
); ),
builder.add(&mut Cursor::new(val), &headers).map_err(err)?; format!("Content-Length: {}", val.len()),
];
builder
.add(&mut Cursor::new(val), &headers.join("\n"))
.map_err(err)?;
} else { } else {
let headers = let headers =
format!(r#"Content-Disposition: form-data; name="{}""#, col,); format!(r#"Content-Disposition: form-data; name="{}""#, col);
builder builder
.add(val.coerce_into_string()?.as_bytes(), &headers) .add(val.coerce_into_string()?.as_bytes(), &headers)
.map_err(err)?; .map_err(err)?;

7
crates/nu-command/tests/commands/network/http/post.rs
View File

@ -210,9 +210,10 @@ fn http_post_multipart_is_success() {
Matcher::Regex("multipart/form-data; boundary=.*".to_string()), Matcher::Regex("multipart/form-data; boundary=.*".to_string()),
) )
.match_body(Matcher::AllOf(vec![ .match_body(Matcher::AllOf(vec![
Matcher::Regex(r#"Content-Disposition: form-data; name="foo""#.to_string()), Matcher::Regex(r#"(?m)^Content-Disposition: form-data; name="foo""#.to_string()),
Matcher::Regex(r#"Content-Type: application/octet-stream"#.to_string()), Matcher::Regex(r#"(?m)^Content-Type: application/octet-stream"#.to_string()),
Matcher::Regex(r#"bar"#.to_string()), Matcher::Regex(r#"(?m)^Content-Length: 3"#.to_string()),
Matcher::Regex(r#"(?m)^bar"#.to_string()),
])) ]))
.with_status(200) .with_status(200)
.create(); .create();