Update to latest versions

Author: dacut

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "scratchstack-aws-signature"
-version = "0.11.1-preview.4"
+version = "0.11.1-preview.5"
 authors = ["David Cuthbert <dacut@kanga.org>"]
 description = "AWS SigV4 signature verification"
 keywords = ["AWS", "Amazon"]
@@ -16,25 +16,25 @@ name = "scratchstack_aws_signature"
 
 [dependencies]
 async-trait = "^0.1"
-bytes = "^1.2"
+bytes = "^1.6"
 chrono = { version = "^0.4", default-features = false, features = [ "std" ] }
-derive_builder = "^0.11"
+derive_builder = "^0.20"
 encoding = "^0.2"
 futures = "^0.3"
 hex = "^0.4"
-http = "^0.2"
-hyper = { version = "^0.14", features = ["stream"] }
-lazy_static = "^1.4"
+http = "^1.1"
+hyper = "^1.4"
+lazy_static = "^1.5"
 log = "^0.4"
-regex = "^1.6"
-ring = "^0.16"
-scratchstack-arn = "^0.4"
-scratchstack-aws-principal = "^0.4"
-scratchstack-errors = "^0.4"
-subtle = "^2.4"
+regex = "^1.10"
+ring = "^0.17"
+scratchstack-arn = "^0.4.9"
+scratchstack-aws-principal = "^0.4.9"
+scratchstack-errors = "^0.4.9"
+subtle = "^2.6"
 tower = { version = "^0.4", features = [ "util" ] }
 
 [dev-dependencies]
-env_logger = "^0.9"
-tokio = { version = "^1.21", features = [ "macros", "rt" ] }
+env_logger = "^0.11"
+tokio = { version = "^1.38", features = [ "macros", "rt" ] }
 test-log = "0.2"

src/auth.rs

@@ -396,8 +396,8 @@ mod tests {
     #[test]
     fn test_derived() {
         init();
-        let epoch = DateTime::<Utc>::from_utc(NaiveDateTime::from_timestamp_opt(0, 0).unwrap(), Utc);
-        let test_time = DateTime::<Utc>::from_utc(
+        let epoch = DateTime::<Utc>::from_timestamp(0, 0).unwrap();
+        let test_time = DateTime::<Utc>::from_naive_utc_and_offset(
             NaiveDateTime::new(
                 NaiveDate::from_ymd_opt(2015, 8, 30).unwrap(),
                 NaiveTime::from_hms_opt(12, 36, 0).unwrap(),
@@ -489,21 +489,21 @@ mod tests {
 
         // Test that the error ordering is correct.
         let creq_sha256: [u8; SHA256_OUTPUT_LEN] = [0; SHA256_OUTPUT_LEN];
-        let test_timestamp = DateTime::<Utc>::from_utc(
+        let test_timestamp = DateTime::<Utc>::from_naive_utc_and_offset(
             NaiveDateTime::new(
                 NaiveDate::from_ymd_opt(2015, 8, 30).unwrap(),
                 NaiveTime::from_hms_opt(12, 36, 0).unwrap(),
             ),
             Utc,
         );
-        let outdated_timestamp = DateTime::<Utc>::from_utc(
+        let outdated_timestamp = DateTime::<Utc>::from_naive_utc_and_offset(
             NaiveDateTime::new(
                 NaiveDate::from_ymd_opt(2015, 8, 30).unwrap(),
                 NaiveTime::from_hms_opt(12, 20, 59).unwrap(),
             ),
             Utc,
         );
-        let future_timestamp = DateTime::<Utc>::from_utc(
+        let future_timestamp = DateTime::<Utc>::from_naive_utc_and_offset(
             NaiveDateTime::new(
                 NaiveDate::from_ymd_opt(2015, 8, 30).unwrap(),
                 NaiveTime::from_hms_opt(12, 51, 1).unwrap(),

src/aws4.rs

@@ -265,7 +265,7 @@ async fn run(basename: &str) {
     // Create a service for getting the signing key.
     let mut signing_key_svc = service_for_signing_key_fn(get_signing_key);
 
-    let test_time = DateTime::<Utc>::from_utc(
+    let test_time = DateTime::<Utc>::from_naive_utc_and_offset(
         NaiveDateTime::new(NaiveDate::from_ymd_opt(2015, 8, 30).unwrap(), NaiveTime::from_hms_opt(12, 36, 0).unwrap()),
         Utc,
     );

src/signature.rs

@@ -4,13 +4,11 @@ use {
         SignedHeaderRequirements,
     },
     async_trait::async_trait,
-    bytes::{Bytes, BytesMut},
+    bytes::Bytes,
     chrono::{DateTime, Duration, Utc},
-    futures::stream::StreamExt,
     http::request::{Parts, Request},
-    hyper::body::Body as HyperBody,
     log::trace,
-    std::{error::Error, future::Future},
+    std::future::Future,
     tower::{BoxError, Service},
 };
 
@@ -77,42 +75,30 @@ where
 
 #[async_trait]
 pub trait IntoRequestBytes {
-    async fn into_request_bytes(self) -> Result<Bytes, Box<dyn Error + Send + Sync>>;
+    async fn into_request_bytes(self) -> Result<Bytes, BoxError>;
 }
 
 #[async_trait]
 impl IntoRequestBytes for () {
-    async fn into_request_bytes(self) -> Result<Bytes, Box<dyn Error + Send + Sync>> {
+    async fn into_request_bytes(self) -> Result<Bytes, BoxError> {
         Ok(Bytes::new())
     }
 }
 
 #[async_trait]
 impl IntoRequestBytes for Vec<u8> {
-    async fn into_request_bytes(self) -> Result<Bytes, Box<dyn Error + Send + Sync>> {
+    async fn into_request_bytes(self) -> Result<Bytes, BoxError> {
         Ok(Bytes::from(self))
     }
 }
 
 #[async_trait]
 impl IntoRequestBytes for Bytes {
-    async fn into_request_bytes(self) -> Result<Bytes, Box<dyn Error + Send + Sync>> {
+    async fn into_request_bytes(self) -> Result<Bytes, BoxError> {
         Ok(self)
     }
 }
 
-#[async_trait]
-impl IntoRequestBytes for HyperBody {
-    async fn into_request_bytes(mut self) -> Result<Bytes, Box<dyn Error + Send + Sync>> {
-        let mut body_bytes = BytesMut::new();
-        while let Some(chunk) = self.next().await {
-            body_bytes.extend_from_slice(&chunk?);
-        }
-
-        Ok(body_bytes.freeze())
-    }
-}
-
 #[cfg(test)]
 mod tests {
     use {
@@ -127,20 +113,21 @@ mod tests {
             request::{Parts, Request},
             uri::{PathAndQuery, Uri},
         },
-        hyper::body::Body as HyperBody,
         lazy_static::lazy_static,
         scratchstack_aws_principal::{Principal, User},
         scratchstack_errors::ServiceError,
-        std::{convert::Infallible, mem::transmute},
+        std::mem::transmute,
         tower::BoxError,
     };
 
     const TEST_REGION: &str = "us-east-1";
     const TEST_SERVICE: &str = "service";
 
     lazy_static! {
-        static ref TEST_TIMESTAMP: DateTime<Utc> =
-            DateTime::from_local(NaiveDate::from_ymd_opt(2015, 8, 30).unwrap().and_hms_opt(12, 36, 0).unwrap(), Utc);
+        static ref TEST_TIMESTAMP: DateTime<Utc> = DateTime::from_naive_utc_and_offset(
+            NaiveDate::from_ymd_opt(2015, 8, 30).unwrap().and_hms_opt(12, 36, 0).unwrap(),
+            Utc
+        );
     }
 
     macro_rules! expect_err {
@@ -502,8 +489,9 @@ mod tests {
                 _ => builder = builder.header("x-amz-date", "20150830T122100Z"),
             }
 
-            let body = futures::stream::once(async { Result::<Bytes, Infallible>::Ok(Bytes::from_static(b"{}")) });
-            let request = builder.body(HyperBody::wrap_stream(body)).unwrap();
+            let body = Bytes::from_static(b"{}");
+
+            let request = builder.body(body).unwrap();
             let mut required_headers = SignedHeaderRequirements::new(
                 vec!["Content-Type".into(), "Qwerty".into()],
                 vec!["Foo".into(), "Bar".into(), "ETag".into()],
@@ -688,7 +676,7 @@ mod tests {
             .header("Host", "example.amazonaws.com")
             .header("X-Amz-Date", "20150830T123600Z")
             .header("Authorization", "AWS4-HMAC-SHA256 Credential=AKIDEXAMPLE/20150830/us-east-1/service/aws4_request, Signature=444cab3690e122afc941d086f06cfbc82c1b4f5c553e32ac81e7629a82ff3831, SignedHeaders=host;x-amz-date")
-            .body(HyperBody::empty())
+            .body(())
             .unwrap();
 
         assert!(sigv4_validate_request(
@@ -710,7 +698,7 @@ mod tests {
             .header("Host", "example.amazonaws.com")
             .header("X-Amz-Date", "20150830T123600Z")
             .header("Authorization", "AWS4-HMAC-SHA256 Credential=AKIDEXAMPLE/20150830/us-east-1/service/aws4_request, Signature=b475de2c96e7bfdfe03bd784d948218730ef62f48ac8bb9f2922af9a44f8657c, SignedHeaders=host;x-amz-date")
-            .body(HyperBody::empty())
+            .body(())
             .unwrap();
 
         assert!(sigv4_validate_request(