diff --git a/src/config_util.rs b/src/config_util.rs index 921b91a..e6022be 100644 --- a/src/config_util.rs +++ b/src/config_util.rs @@ -106,34 +106,6 @@ impl OSSBackupdConfigItem { } } -fn real_make_oss_key(oss_backupd_config: &OSSBackupdConfig, oss_backupd_config_item: &OSSBackupdConfigItem, suffix: &str) -> String { - let mut key = String::with_capacity(1024); - key.push_str(&oss_backupd_config.get_prefix()); - key.push_str("/"); - key.push_str(&oss_backupd_config.get_host()); - key.push_str("/"); - key.push_str(&oss_backupd_config_item.get_file_name()); - key.push_str("_"); - key.push_str(&get_now_ymdhms()); - - if !suffix.is_empty() { - key.push_str(&format!(".{}", suffix)); - } - - key -} - -pub fn remove_start_end_slash(s: &str) -> String { - let mut ss = s; - while ss.starts_with("/") { - ss = &ss[1..] - } - while ss.ends_with("/") { - ss = &ss[0..(ss.len() - 1)]; - } - ss.to_owned() -} - pub fn parse_config(config_json: &json::JsonValue) -> OSSBackupdConfig { let root_oss_config_object = parse_sub_oss_config(config_json); let encrypt_pubkey_file = get_string_value(config_json, "encrypt_pubkey_file"); @@ -157,6 +129,28 @@ pub fn parse_config(config_json: &json::JsonValue) -> OSSBackupdConfig { } } +pub fn get_config_json(custom_oss_backupd_config: Option<&str>, verbose: bool) -> Option { + let config_content = get_config_content(custom_oss_backupd_config, verbose)?; + match json::parse(&config_content) { + Err(e) => { + print_message(MessageType::ERROR, &format!("Parse config json failed: {}", e)); + None + }, + Ok(o) => Some(o), + } +} + +fn remove_start_end_slash(s: &str) -> String { + let mut ss = s; + while ss.starts_with("/") { + ss = &ss[1..] + } + while ss.ends_with("/") { + ss = &ss[0..(ss.len() - 1)]; + } + ss.to_owned() +} + fn parse_oss_backupd_config_item(item: &json::JsonValue, root_oss_config_object: &Option, root_encrypt_pubkey_file: &Option, root_backup_count: &Option) -> OSSBackupdConfigItem { let target = get_string_value(item, "target"); let file_name = get_string_value(item, "file_name"); @@ -203,6 +197,23 @@ fn parse_oss_backupd_config_item(item: &json::JsonValue, root_oss_config_object: } } +fn real_make_oss_key(oss_backupd_config: &OSSBackupdConfig, oss_backupd_config_item: &OSSBackupdConfigItem, suffix: &str) -> String { + let mut key = String::with_capacity(1024); + key.push_str(&oss_backupd_config.get_prefix()); + key.push_str("/"); + key.push_str(&oss_backupd_config.get_host()); + key.push_str("/"); + key.push_str(&oss_backupd_config_item.get_file_name()); + key.push_str("_"); + key.push_str(&get_now_ymdhms()); + + if !suffix.is_empty() { + key.push_str(&format!(".{}", suffix)); + } + + key +} + fn parse_sub_oss_config(json: &json::JsonValue) -> Option { let root_oss_config = &json["oss_config"]; iff!(root_oss_config.is_null(), None, Some(parse_oss_config(root_oss_config))) @@ -232,17 +243,6 @@ fn get_u32_value(json: &json::JsonValue, key: &str) -> Option { } } -pub fn get_config_json(custom_oss_backupd_config: Option<&str>, verbose: bool) -> Option { - let config_content = get_config_content(custom_oss_backupd_config, verbose)?; - match json::parse(&config_content) { - Err(e) => { - print_message(MessageType::ERROR, &format!("Parse config json failed: {}", e)); - None - }, - Ok(o) => Some(o), - } -} - fn get_config_content(custom_oss_backupd_config: Option<&str>, verbose: bool) -> Option { if let Some(custom_oss_backupd_config_val) = custom_oss_backupd_config { if verbose { diff --git a/src/oss_util.rs b/src/oss_util.rs index f825a65..82a5406 100644 --- a/src/oss_util.rs +++ b/src/oss_util.rs @@ -21,6 +21,14 @@ pub const OSS_VERB_GET: &str = "GET"; pub const OSS_VERB_PUT: &str = "PUT"; pub const OSS_VERB_DELETE: &str = "DELETE"; +const HTTP_SS: &str = "http://"; +const HTTPS_SS: &str = "https://"; + +const HTTP_SC_SUCCESS: u16 = 200; +const HTTP_SC_NOT_FOUND: u16 = 404; + +const INTERNAL_DEFAULT_VALID_IN_SECS: u64 = 30; + // https://help.aliyun.com/document_detail/31952.html pub struct OSSClient { pub endpoint: String, @@ -31,9 +39,9 @@ pub struct OSSClient { impl OSSClient { pub fn new(endpoint: &str, access_key_id: &str, access_key_secret: &str) -> OSSClient { OSSClient { - endpoint: endpoint.to_owned(), - access_key_id: access_key_id.to_owned(), - access_key_secret: access_key_secret.to_owned(), + endpoint: endpoint.into(), + access_key_id: access_key_id.into(), + access_key_secret: access_key_secret.into(), } } @@ -43,23 +51,23 @@ impl OSSClient { } pub fn delete_file(&self, bucket_name: &str, key: &str) -> XResult { - let delete_url = self.generate_signed_delete_url(bucket_name, key, 30_u64); + let delete_url = self.generate_signed_delete_url(bucket_name, key, INTERNAL_DEFAULT_VALID_IN_SECS); let client = reqwest::Client::new(); Ok(client.delete(&delete_url).send()?) } pub fn get_file_content(&self, bucket_name: &str, key: &str) -> XResult> { - let get_url = self.generate_signed_get_url(bucket_name, key, 30_u64); + let get_url = self.generate_signed_get_url(bucket_name, key, INTERNAL_DEFAULT_VALID_IN_SECS); let mut response = reqwest::get(&get_url)?; match response.status().as_u16() { - 404_u16 => Ok(None), - 200_u16 => Ok(Some(response.text()?)), + HTTP_SC_NOT_FOUND => Ok(None), + HTTP_SC_SUCCESS => Ok(Some(response.text()?)), _ => Err(new_box_ioerror(&format!("Error in read: {}/{}, returns: {:?}", bucket_name, key, response))), } } pub fn put_file_content(&self, bucket_name: &str, key: &str, content: &str) -> XResult { - let put_url = self.generate_signed_put_url(bucket_name, key, 30_u64); + let put_url = self.generate_signed_put_url(bucket_name, key, INTERNAL_DEFAULT_VALID_IN_SECS); let client = reqwest::Client::new(); Ok(client.put(&put_url).body(content.as_bytes().to_vec()).send()?) } @@ -78,7 +86,7 @@ impl OSSClient { pub fn generate_signed_url(&self, verb: &str, bucket_name: &str, key: &str, expire_in_seconds: u64, is_https: bool) -> String { let mut signed_url = String::with_capacity(1024); - signed_url.push_str(iff!(is_https, "https://", "http://")); + signed_url.push_str(iff!(is_https, HTTPS_SS, HTTP_SS)); let endpoint = &remove_endpoint_http_or_s(&self.endpoint); signed_url.push_str(&format!("{}.{}/{}", bucket_name, endpoint, key)); @@ -103,7 +111,7 @@ impl OSSClient { // https://endpoint, or http://endpoint -> endpoint fn remove_endpoint_http_or_s(endpoint: &str) -> String { let mut endpoint = endpoint.to_owned(); - for prefix in vec!["http://", "https://"] { + for prefix in vec![HTTP_SS, HTTPS_SS] { if endpoint.starts_with(prefix) { endpoint = endpoint.chars().skip(prefix.chars().count()).collect::() }