Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions src/http/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -207,6 +207,16 @@ pub async fn execute(cli: &Cli) -> Result<i32, FetchError> {
if !auth_allowed {
strip_cross_origin_sensitive_headers(&mut attempt_headers);
}
if auth_allowed && let Some(config) = &aws_config {
apply_aws_sigv4(
cli,
request_method.as_str(),
&request_url,
&mut attempt_headers,
&request_body,
config,
)?;
}
if cli.verbose >= 2 && !cli.silent {
print_request_metadata(
cli,
Expand All @@ -226,16 +236,6 @@ pub async fn execute(cli: &Cli) -> Result<i32, FetchError> {
{
print_dns_debug(cli, dns);
}
if auth_allowed && let Some(config) = &aws_config {
apply_aws_sigv4(
cli,
request_method.as_str(),
&request_url,
&mut attempt_headers,
&request_body,
config,
)?;
}

let req = build_request(
&request_client.client,
Expand Down
7 changes: 7 additions & 0 deletions tests/integration.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2779,13 +2779,20 @@ fn basic_bearer_and_aws_auth_headers() {
&format!("{}/aws", server.url),
"--aws-sigv4",
"us-east-1/s3",
"-vv",
],
);
assert_exit(&res, 0);
assert_eq!(
res.stdout,
"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"
);
assert!(res.stderr.contains("> authorization: AWS4-HMAC-SHA256 "));
assert!(res.stderr.contains("> x-amz-date: "));
assert!(res.stderr.contains("> x-amz-security-token: session-token"));
assert!(res.stderr.contains(
"> x-amz-content-sha256: e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"
));
}

#[test]
Expand Down
Loading