Commit 68c8fc05 authored by Nugine's avatar Nugine
Browse files

s3s: utils: refactor

parent c6476267

crates/s3s/src/http/ser.rs

+3 −2
Original line number Diff line number Diff line
@@ -5,7 +5,8 @@ use crate::dto::SelectObjectContentEventStream; 
use crate::dto::{Metadata, StreamingBlob, Timestamp, TimestampFormat};

use crate::error::{S3Error, S3Result};

use crate::http::{HeaderName, HeaderValue};

use crate::{utils, xml};

use crate::utils::format::fmt_timestamp;

use crate::xml;



use std::convert::Infallible;

use std::fmt::Write as _;
@@ -41,7 +42,7 @@ where 
    N: IntoHeaderName,

{

    if let Some(value) = value {

        let val = utils::fmt_timestamp(&value, fmt, HeaderValue::from_bytes).map_err(S3Error::internal_error)?;

        let val = fmt_timestamp(&value, fmt, HeaderValue::from_bytes).map_err(S3Error::internal_error)?;

        res.headers.insert(name, val);

    }

    Ok(())

crates/s3s/src/ops/get_object.rs

+2 −2
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ use crate::dto::GetObjectInput; 
use crate::dto::Timestamp;

use crate::dto::TimestampFormat;

use crate::header;

use crate::utils;

use crate::utils::format::fmt_timestamp;

use crate::S3Request;

use crate::S3Result;
@@ -37,7 +37,7 @@ fn add(map: &mut HeaderMap<HeaderValue>, name: HeaderName, value: Option<&str>) 
fn add_ts(map: &mut HeaderMap<HeaderValue>, name: HeaderName, value: Option<&Timestamp>) -> S3Result<()> {

    let error = |e| invalid_request!(e, "invalid overrided header: {name}: {value:?}");

    if let Some(value) = value {

        let value = utils::fmt_timestamp(value, TimestampFormat::HttpDate, HeaderValue::from_bytes).map_err(error)?;

        let value = fmt_timestamp(value, TimestampFormat::HttpDate, HeaderValue::from_bytes).map_err(error)?;

        map.insert(name, value);

    }

    Ok(())

crates/s3s/src/ops/mod.rs

+1 −1
Original line number Diff line number Diff line
@@ -160,7 +160,7 @@ async fn extract_full_body(content_length: Option<u64>, body: &mut Body) -> S3Re 
fn fmt_content_length(len: usize) -> http::HeaderValue {

    const ZERO: http::HeaderValue = http::HeaderValue::from_static("0");

    if len > 0 {

        crate::utils::fmt_usize(len, |s| http::HeaderValue::try_from(s).unwrap())

        crate::utils::format::fmt_usize(len, |s| http::HeaderValue::try_from(s).unwrap())

    } else {

        ZERO

    }

crates/s3s/src/request.rs

+1 −1
Original line number Diff line number Diff line 
use crate::auth::Credentials;

use crate::utils::default;



use hyper::http::{Extensions, HeaderValue};

use hyper::{HeaderMap, Uri};

use rust_utils::default::default;



#[derive(Debug)]

#[non_exhaustive]

crates/s3s/src/sig_v2/methods.rs

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ use crate::auth::SecretKey; 
use crate::http::OrderedHeaders;

use crate::http::OrderedQs;

use crate::path::S3Path;

use crate::utils::hmac_sha1;

use crate::utils::crypto::hmac_sha1;



use std::ops::Not;