Skip to content

Commit ebe13d1

Browse files
committed
Make SignedHeaderRequirements a trait
This allows easier use for the typical case, where the SignedHeaders is either empty or is initialized from static string slices. This has the side benefit of removing allocations in the common case.
1 parent 3fcdcfc commit ebe13d1

File tree

4 files changed

+182
-125
lines changed

4 files changed

+182
-125
lines changed

src/aws4.rs

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
use {
22
crate::{
33
service_for_signing_key_fn, sigv4_validate_request, CanonicalRequest, GetSigningKeyRequest,
4-
GetSigningKeyResponse, KSecretKey, SignatureOptions, SignedHeaderRequirements,
4+
GetSigningKeyResponse, KSecretKey, SignatureOptions, NO_ADDITIONAL_SIGNED_HEADERS,
55
},
66
bytes::{Bytes, BytesMut},
77
chrono::{DateTime, NaiveDate, NaiveDateTime, NaiveTime, Utc},
@@ -226,8 +226,8 @@ async fn run(basename: &str) {
226226
expected_canonical_request.retain(|c| *c != b'\r'); // Remove carriage returns (not newlines)
227227

228228
// Check the canonical request.
229-
let req = SignedHeaderRequirements::default();
230-
let auth_params = canonical.get_auth_parameters(&req).expect("Failed to get auth parameters");
229+
let auth_params =
230+
canonical.get_auth_parameters(&NO_ADDITIONAL_SIGNED_HEADERS).expect("Failed to get auth parameters");
231231
let canonical_request = canonical.canonical_request(&auth_params.signed_headers);
232232
assert_eq!(
233233
String::from_utf8_lossy(canonical_request.as_slice()),
@@ -273,14 +273,13 @@ async fn run(basename: &str) {
273273
// Create a GetSigningKeyRequest from our existing request.
274274
debug!("body: {:?}", body);
275275
let request = Request::from_parts(parts, body);
276-
let required_headers = SignedHeaderRequirements::default();
277276
sigv4_validate_request(
278277
request,
279278
TEST_REGION,
280279
TEST_SERVICE,
281280
&mut signing_key_svc,
282281
test_time,
283-
&required_headers,
282+
&NO_ADDITIONAL_SIGNED_HEADERS,
284283
SignatureOptions::url_encode_form(),
285284
)
286285
.await

0 commit comments

Comments
 (0)