mirrors/minio-rs
1
0
Fork 0
mirror of https://github.com/minio/minio-rs.git synced 2026-01-22 15:42:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

Move to debug! instead of println! (#7)

Browse Source
This commit is contained in:
Daniel Valdivia 2019-07-10 09:56:11 -07:00 committed by Aditya Manthramurthy
parent 128ecb871f
commit 891d050e35
4 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Cargo.toml
View File

@ -10,6 +10,8 @@ futures = "0.1.27"
http = "0.1.17" http = "0.1.17"
hyper = "0.12.28" hyper = "0.12.28"
hyper-tls = "0.3.2" hyper-tls = "0.3.2"
log = "0.4.6"
pretty_env_logger = "0.3.0"
ring = "0.14.6" ring = "0.14.6"
roxmltree = "0.6.0" roxmltree = "0.6.0"
serde = "1.0.92" serde = "1.0.92"

4
src/minio.rs
View File

@ -40,7 +40,7 @@ mod notification;
mod sign; mod sign;
mod types; mod types;
mod xml; mod xml;
use log::debug;
mod woxml; mod woxml;
pub const SPACE_BYTE: &[u8; 1] = b" "; pub const SPACE_BYTE: &[u8; 1] = b" ";
@ -181,7 +181,7 @@ impl Client {
.and_then(move |body| { .and_then(move |body| {
s3_req.body = body; s3_req.body = body;
let sign_hdrs = sign::sign_v4(&s3_req, creds, region); let sign_hdrs = sign::sign_v4(&s3_req, creds, region);
println!("signout: {:?}", sign_hdrs); debug!("signout: {:?}", sign_hdrs);
api::mk_request(&s3_req, &server_addr, &sign_hdrs) api::mk_request(&s3_req, &server_addr, &sign_hdrs)
}) })
.and_then(move |req| conn_client.make_req(req).map_err(|e| Err::HyperErr(e))) .and_then(move |req| conn_client.make_req(req).map_err(|e| Err::HyperErr(e)))

8
src/minio/api.rs
View File

@ -15,9 +15,9 @@
* limitations under the License. * limitations under the License.
*/ */
use hyper::{header::HeaderName, header::HeaderValue, Body, Request};
use crate::minio; use crate::minio;
use hyper::{header::HeaderName, header::HeaderValue, Body, Request};
use log::debug;
pub fn mk_request( pub fn mk_request(
r: &minio::S3Req, r: &minio::S3Req,
@ -26,9 +26,9 @@ pub fn mk_request(
) -> Result<Request<Body>, minio::Err> { ) -> Result<Request<Body>, minio::Err> {
let mut request = Request::builder(); let mut request = Request::builder();
let uri_str = svr_str.trim_end_matches('/'); let uri_str = svr_str.trim_end_matches('/');
println!("uri_str: {}", uri_str); debug!("uri_str: {}", uri_str);
let upd_uri = format!("{}{}?{}", uri_str, r.mk_path(), r.mk_query()); let upd_uri = format!("{}{}?{}", uri_str, r.mk_path(), r.mk_query());
println!("upd_uri: {}", upd_uri); debug!("upd_uri: {}", upd_uri);
request.uri(&upd_uri).method(&r.method); request.uri(&upd_uri).method(&r.method);
for hdr in r for hdr in r

9
src/minio/sign.rs
View File

@ -20,6 +20,7 @@ use std::collections::{HashMap, HashSet};
use hyper::header::{ use hyper::header::{
HeaderMap, HeaderName, HeaderValue, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT, HeaderMap, HeaderName, HeaderValue, AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE, USER_AGENT,
}; };
use log::debug;
use ring::{digest, hmac}; use ring::{digest, hmac};
use time::Tm; use time::Tm;
@ -183,13 +184,13 @@ pub fn sign_v4(
.collect::<Vec<String>>() .collect::<Vec<String>>()
.join(";"); .join(";");
let cr = get_canonical_request(r, &hs, &signed_hdrs_str); let cr = get_canonical_request(r, &hs, &signed_hdrs_str);
println!("canonicalreq: {}", cr); debug!("canonicalreq: {}", cr);
let s2s = string_to_sign(&r.ts, &scope, &cr); let s2s = string_to_sign(&r.ts, &scope, &cr);
println!("s2s: {}", s2s); debug!("s2s: {}", s2s);
let skey = get_signing_key(&r.ts, &region.to_string(), &creds.secret_key); let skey = get_signing_key(&r.ts, &region.to_string(), &creds.secret_key);
println!("skey: {:?}", skey); debug!("skey: {:?}", skey);
let signature = compute_sign(&s2s, &skey); let signature = compute_sign(&s2s, &skey);
println!("sign: {}", signature); debug!("sign: {}", signature);
let auth_hdr_val = format!( let auth_hdr_val = format!(
"AWS4-HMAC-SHA256 Credential={}/{}, SignedHeaders={}, Signature={}", "AWS4-HMAC-SHA256 Credential={}/{}, SignedHeaders={}, Signature={}",