Unverified Commit c18abd96 authored by Nugine's avatar Nugine
Browse files

s3s: sig_v4: amz_date: fmt

parent 613da266

crates/s3s/src/sig_v4/amz_date.rs

+12 −9
Original line number Diff line number Diff line 
//! x-amz-date



use std::fmt::Write as _;

use std::str::FromStr;



use arrayvec::ArrayString;



/// x-amz-date

#[derive(Debug, Clone)]

pub struct AmzDate {
@@ -79,19 +82,19 @@ impl AmzDate { 


    /// `{YYYY}{MM}{DD}T{HH}{MM}{SS}Z`

    #[must_use]

    pub fn fmt_iso8601(&self) -> String {

        // TODO: small string

        format!(

            "{:04}{:02}{:02}T{:02}{:02}{:02}Z",

            self.year, self.month, self.day, self.hour, self.minute, self.second

        )

    pub fn fmt_iso8601(&self) -> ArrayString<16> {

        let mut buf = <ArrayString<16>>::new();

        let (y, m, d, hh, mm, ss) = (self.year, self.month, self.day, self.hour, self.minute, self.second);

        write!(&mut buf, "{y:04}{m:02}{d:02}T{hh:02}{mm:02}{ss:02}Z").unwrap();

        buf

    }



    /// `{YYYY}{MM}{DD}`

    #[must_use]

    pub fn fmt_date(&self) -> String {

        // TODO: small string

        format!("{:04}{:02}{:02}", self.year, self.month, self.day,)

    pub fn fmt_date(&self) -> ArrayString<8> {

        let mut buf = <ArrayString<8>>::new();

        write!(&mut buf, "{:04}{:02}{:02}", self.year, self.month, self.day).unwrap();

        buf

    }



    pub fn to_time(&self) -> Option<time::OffsetDateTime> {

crates/s3s/src/sig_v4/methods.rs

+1 −1
Original line number Diff line number Diff line
@@ -284,7 +284,7 @@ pub fn calculate_signature(string_to_sign: &str, secret_key: &str, amz_date: &Am 


    // DateKey

    let date = amz_date.fmt_date();

    let date_key = hmac_sha256(secret, date);

    let date_key = hmac_sha256(secret, date.as_bytes());



    // DateRegionKey

    let date_region_key = hmac_sha256(date_key, region); // TODO: use a `Region` type