separate signer.

fix ilm feature.

ecstore/src/client/admin_handler_utils.rs

@@ -1,10 +1,10 @@
 use http::status::StatusCode;
 use std::fmt::{self, Display, Formatter};
 
-#[derive(Default, thiserror::Error, Debug, PartialEq)]
+#[derive(Default, thiserror::Error, Debug, Clone, PartialEq)]
 pub struct AdminError {
-    pub code: &'static str,
-    pub message: &'static str,
+    pub code: String,
+    pub message: String,
     pub status_code: StatusCode,
 }
 
@@ -15,18 +15,18 @@ impl Display for AdminError {
 }
 
 impl AdminError {
-    pub fn new(code: &'static str, message: &'static str, status_code: StatusCode) -> Self {
+    pub fn new(code: &str, message: &str, status_code: StatusCode) -> Self {
         Self {
-            code,
-            message,
+            code: code.to_string(),
+            message: message.to_string(),
             status_code,
         }
     }
 
-    pub fn msg(message: &'static str) -> Self {
+    pub fn msg(message: &str) -> Self {
         Self {
-            code: "InternalError",
-            message,
+            code: "InternalError".to_string(),
+            message: message.to_string(),
             status_code: StatusCode::INTERNAL_SERVER_ERROR,
         }
     }

ecstore/src/client/api_get_object.rs

@@ -61,6 +61,7 @@ impl TransitionClient {
 }
 
 #[derive(Default)]
+#[allow(dead_code)]
 pub struct GetRequest {
     pub buffer: Vec<u8>,
     pub offset: i64,
@@ -72,6 +73,7 @@ pub struct GetRequest {
     pub setting_object_info: bool,
 }
 
+#[allow(dead_code)]
 pub struct GetResponse {
     pub size: i64,
     //pub error:       error,

ecstore/src/client/api_get_options.rs

@@ -14,6 +14,7 @@ use tracing::warn;
 use crate::client::api_error_response::err_invalid_argument;
 
 #[derive(Default)]
+#[allow(dead_code)]
 pub struct AdvancedGetOptions {
     replication_deletemarker: bool,
     is_replication_ready_for_deletemarker: bool,
@@ -30,8 +31,6 @@ pub struct GetObjectOptions {
     pub internal: AdvancedGetOptions,
 }
 
-type StatObjectOptions = GetObjectOptions;
-
 impl Default for GetObjectOptions {
     fn default() -> Self {
         Self {

ecstore/src/client/api_list.rs

@@ -258,6 +258,7 @@ impl TransitionClient {
     }
 }
 
+#[allow(dead_code)]
 pub struct ListObjectsOptions {
     reverse_versions: bool,
     with_versions: bool,

ecstore/src/client/api_put_object.rs

@@ -12,7 +12,7 @@ use std::{collections::HashMap, sync::Arc};
 use time::{Duration, OffsetDateTime, macros::format_description};
 use tracing::{error, info, warn};
 
-use reader::hasher::Hasher;
+use rustfs_utils::hasher::Hasher;
 use s3s::dto::{ObjectLockLegalHoldStatus, ObjectLockRetentionMode, ReplicationStatus};
 use s3s::header::{
     X_AMZ_OBJECT_LOCK_LEGAL_HOLD, X_AMZ_OBJECT_LOCK_MODE, X_AMZ_OBJECT_LOCK_RETAIN_UNTIL_DATE, X_AMZ_REPLICATION_STATUS,
@@ -124,6 +124,7 @@ impl Default for PutObjectOptions {
     }
 }
 
+#[allow(dead_code)]
 impl PutObjectOptions {
     fn set_matche_tag(&mut self, etag: &str) {
         if etag == "*" {

ecstore/src/client/api_put_object_common.rs

@@ -14,8 +14,6 @@ use crate::client::{
     transition_api::TransitionClient,
 };
 
-const NULL_VERSION_ID: &str = "null";
-
 pub fn is_object(reader: &ReaderImpl) -> bool {
     todo!();
 }

ecstore/src/client/api_put_object_multipart.rs

@@ -18,7 +18,7 @@ use tracing::{error, info};
 use url::form_urlencoded::Serializer;
 use uuid::Uuid;
 
-use reader::hasher::Hasher;
+use rustfs_utils::hasher::Hasher;
 use s3s::header::{X_AMZ_EXPIRATION, X_AMZ_VERSION_ID};
 use s3s::{Body, dto::StreamingBlob};
 //use crate::disk::{Reader, BufferReader};

ecstore/src/client/api_put_object_streaming.rs

@@ -27,7 +27,7 @@ use crate::client::{
     constants::ISO8601_DATEFORMAT,
     transition_api::{ReaderImpl, RequestMetadata, TransitionClient, UploadInfo},
 };
-use reader::hasher::Hasher;
+use rustfs_utils::hasher::Hasher;
 use rustfs_utils::{crypto::base64_encode, path::trim_etag};
 use s3s::header::{X_AMZ_EXPIRATION, X_AMZ_VERSION_ID};
 

ecstore/src/client/api_remove.rs

@@ -24,14 +24,15 @@ use crate::{
     disk::DiskAPI,
     store_api::{GetObjectReader, ObjectInfo, StorageAPI},
 };
-use reader::hasher::{sum_md5_base64, sum_sha256_hex};
+use rustfs_utils::hasher::{sum_md5_base64, sum_sha256_hex};
 use rustfs_utils::hash::EMPTY_STRING_SHA256_HASH;
 
 pub struct RemoveBucketOptions {
-    forced_elete: bool,
+    _forced_elete: bool,
 }
 
 #[derive(Debug)]
+#[allow(dead_code)]
 pub struct AdvancedRemoveOptions {
     replication_delete_marker: bool,
     replication_status: ReplicationStatus,
@@ -426,8 +427,10 @@ impl TransitionClient {
 }
 
 #[derive(Debug, Default)]
+#[allow(dead_code)]
 pub struct RemoveObjectError {
     object_name: String,
+    #[allow(dead_code)]
     version_id: String,
     err: Option<std::io::Error>,
 }

ecstore/src/client/api_s3_datatypes.rs

@@ -43,6 +43,7 @@ pub struct ListBucketV2Result {
     pub start_after: String,
 }
 
+#[allow(dead_code)]
 pub struct Version {
     etag: String,
     is_latest: bool,
@@ -72,12 +73,6 @@ pub struct ListVersionsResult {
     next_version_id_marker: String,
 }
 
-impl ListVersionsResult {
-    fn unmarshal_xml() -> Result<(), std::io::Error> {
-        todo!();
-    }
-}
-
 pub struct ListBucketResult {
     common_prefixes: Vec<CommonPrefix>,
     contents: Vec<transition_api::ObjectInfo>,

ecstore/src/client/bucket_cache.rs

@@ -17,8 +17,7 @@ use crate::client::{
     api_error_response::{http_resp_to_error_response, to_error_response},
     transition_api::{Document, TransitionClient},
 };
-use crate::signer;
-use reader::hasher::{Hasher, Sha256};
+use rustfs_utils::hasher::{Hasher, Sha256};
 use rustfs_utils::hash::EMPTY_STRING_SHA256_HASH;
 use s3s::Body;
 use s3s::S3ErrorCode;
@@ -151,7 +150,7 @@ impl TransitionClient {
         }
 
         if signer_type == SignatureType::SignatureV2 {
-            let req_builder = signer::sign_v2(req_builder, 0, &access_key_id, &secret_access_key, is_virtual_style);
+            let req_builder = rustfs_signer::sign_v2(req_builder, 0, &access_key_id, &secret_access_key, is_virtual_style);
             let req = match req_builder.body(Body::empty()) {
                 Ok(req) => return Ok(req),
                 Err(err) => {
@@ -169,7 +168,7 @@ impl TransitionClient {
             .headers_mut()
             .expect("err")
             .insert("X-Amz-Content-Sha256", content_sha256.parse().unwrap());
-        let req_builder = signer::sign_v4(req_builder, 0, &access_key_id, &secret_access_key, &session_token, "us-east-1");
+        let req_builder = rustfs_signer::sign_v4(req_builder, 0, &access_key_id, &secret_access_key, &session_token, "us-east-1");
         let req = match req_builder.body(Body::empty()) {
             Ok(req) => return Ok(req),
             Err(err) => {

ecstore/src/client/constants.rs

@@ -1,4 +1,3 @@
-#![allow(clippy::map_entry)]
 #![allow(unused_imports)]
 #![allow(unused_variables)]
 #![allow(unused_mut)]
@@ -28,4 +27,4 @@ pub const ISO8601_DATEFORMAT: &[FormatItem<'_>] =
 
 pub const GET_OBJECT_ATTRIBUTES_TAGS: &str = "ETag,Checksum,StorageClass,ObjectSize,ObjectParts";
 pub const GET_OBJECT_ATTRIBUTES_MAX_PARTS: i64 = 1000;
-const RUSTFS_BUCKET_SOURCE_MTIME: &str = "X-RustFs-Source-Mtime";
+const _RUSTFS_BUCKET_SOURCE_MTIME: &str = "X-RustFs-Source-Mtime";

ecstore/src/client/credentials.rs

@@ -141,28 +141,6 @@ impl ErrorResponse {
     }
 }
 
-struct Error {
-    code: String,
-    message: String,
-    bucket_name: String,
-    key: String,
-    resource: String,
-    request_id: String,
-    host_id: String,
-    region: String,
-    server: String,
-    status_code: i64,
-}
-
-impl Display for Error {
-    fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
-        if self.message == "" {
-            return write!(f, "{}", format!("Error response code {}.", self.code));
-        }
-        write!(f, "{}", self.message)
-    }
-}
-
 pub fn xml_decoder<T>(body: &[u8]) -> Result<T, std::io::Error> {
     todo!();
 }

ecstore/src/client/object_api_utils.rs

@@ -24,16 +24,12 @@ pub struct PutObjReader {
     //pub sealMD5Fn: SealMD5CurrFn,
 }
 
+#[allow(dead_code)]
 impl PutObjReader {
     pub fn new(raw_reader: HashReader) -> Self {
         todo!();
     }
 
-    fn size(&self) -> usize {
-        //self.reader.size()
-        todo!();
-    }
-
     fn md5_current_hex_string(&self) -> String {
         todo!();
     }

ecstore/src/client/transition_api.rs

@@ -45,9 +45,8 @@ use crate::client::{
     constants::{UNSIGNED_PAYLOAD, UNSIGNED_PAYLOAD_TRAILER},
     credentials::{CredContext, Credentials, SignatureType, Static},
 };
-use crate::signer;
 use crate::{checksum::ChecksumMode, store_api::GetObjectReader};
-use reader::hasher::{MD5, Sha256};
+use rustfs_utils::hasher::{MD5, Sha256};
 use rustfs_rio::HashReader;
 use rustfs_utils::{
     net::get_endpoint_url,
@@ -57,7 +56,7 @@ use s3s::S3ErrorCode;
 use s3s::dto::ReplicationStatus;
 use s3s::{Body, dto::Owner};
 
-const C_USER_AGENT_PREFIX: &str = "RustFS (linux; x86)";
+const _C_USER_AGENT_PREFIX: &str = "RustFS (linux; x86)";
 const C_USER_AGENT: &str = "RustFS (linux; x86)";
 
 const SUCCESS_STATUS: [StatusCode; 3] = [StatusCode::OK, StatusCode::NO_CONTENT, StatusCode::PARTIAL_CONTENT];
@@ -433,9 +432,9 @@ impl TransitionClient {
             }
             if signer_type == SignatureType::SignatureV2 {
                 req_builder =
-                    signer::pre_sign_v2(req_builder, &access_key_id, &secret_access_key, metadata.expires, is_virtual_host);
+                    rustfs_signer::pre_sign_v2(req_builder, &access_key_id, &secret_access_key, metadata.expires, is_virtual_host);
             } else if signer_type == SignatureType::SignatureV4 {
-                req_builder = signer::pre_sign_v4(
+                req_builder = rustfs_signer::pre_sign_v4(
                     req_builder,
                     &access_key_id,
                     &secret_access_key,
@@ -486,7 +485,7 @@ impl TransitionClient {
 
         if signer_type == SignatureType::SignatureV2 {
             req_builder =
-                signer::sign_v2(req_builder, metadata.content_length, &access_key_id, &secret_access_key, is_virtual_host);
+                rustfs_signer::sign_v2(req_builder, metadata.content_length, &access_key_id, &secret_access_key, is_virtual_host);
         } else if metadata.stream_sha256 && !self.secure {
             if metadata.trailer.len() > 0 {
                 //req.Trailer = metadata.trailer;
@@ -494,7 +493,7 @@ impl TransitionClient {
                     req_builder = req_builder.header(http::header::TRAILER, v.clone());
                 }
             }
-            //req_builder = signer::streaming_sign_v4(req_builder, &access_key_id,
+            //req_builder = rustfs_signer::streaming_sign_v4(req_builder, &access_key_id,
             //  &secret_access_key, &session_token, &location, metadata.content_length, OffsetDateTime::now_utc(), self.sha256_hasher());
         } else {
             let mut sha_header = UNSIGNED_PAYLOAD.to_string();
@@ -509,7 +508,7 @@ impl TransitionClient {
             req_builder = req_builder
                 .header::<HeaderName, HeaderValue>("X-Amz-Content-Sha256".parse().unwrap(), sha_header.parse().expect("err"));
 
-            req_builder = signer::sign_v4_trailer(
+            req_builder = rustfs_signer::sign_v4_trailer(
                 req_builder,
                 &access_key_id,
                 &secret_access_key,
@@ -614,23 +613,6 @@ impl TransitionClient {
     }
 }
 
-struct LockedRandSource {
-    src: u64, //rand.Source,
-}
-
-impl LockedRandSource {
-    fn int63(&self) -> i64 {
-        /*let n = self.src.int63();
-        n*/
-        todo!();
-    }
-
-    fn seed(&self, seed: i64) {
-        //self.src.seed(seed);
-        todo!();
-    }
-}
-
 pub struct RequestMetadata {
     pub pre_sign_url: bool,
     pub bucket_name: String,