From 299e8f7a2ce20005bb4d180b4556fd6facafdd47 Mon Sep 17 00:00:00 2001 From: weisd Date: Fri, 9 Aug 2024 23:15:56 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BF=87=E6=BB=A4=E6=97=A0=E6=95=88bucketname?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ecstore/src/peer.rs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/ecstore/src/peer.rs b/ecstore/src/peer.rs index 3bc2b8eef..5013bab0b 100644 --- a/ecstore/src/peer.rs +++ b/ecstore/src/peer.rs @@ -410,18 +410,18 @@ impl PeerS3Client for RemotePeerS3Client { // 检查桶名是否有效 fn check_bucket_name(bucket_name: &str, strict: bool) -> Result<()> { if bucket_name.trim().is_empty() { - return Err(Error::from_string("Bucket name cannot be empty")); + return Err(Error::msg("Bucket name cannot be empty")); } if bucket_name.len() < 3 { - return Err(Error::from_string("Bucket name cannot be shorter than 3 characters")); + return Err(Error::msg("Bucket name cannot be shorter than 3 characters")); } if bucket_name.len() > 63 { - return Err(Error::from_string("Bucket name cannot be longer than 63 characters")); + return Err(Error::msg("Bucket name cannot be longer than 63 characters")); } let ip_address_regex = Regex::new(r"^(\d+\.){3}\d+$").unwrap(); if ip_address_regex.is_match(bucket_name) { - return Err(Error::from_string("Bucket name cannot be an IP address")); + return Err(Error::msg("Bucket name cannot be an IP address")); } let valid_bucket_name_regex = if strict { @@ -431,12 +431,12 @@ fn check_bucket_name(bucket_name: &str, strict: bool) -> Result<()> { }; if !valid_bucket_name_regex.is_match(bucket_name) { - return Err(Error::from_string("Bucket name contains invalid characters")); + return Err(Error::msg("Bucket name contains invalid characters")); } // 检查包含 "..", ".-", "-." if bucket_name.contains("..") || bucket_name.contains(".-") || bucket_name.contains("-.") { - return Err(Error::from_string("Bucket name contains invalid characters")); + return Err(Error::msg("Bucket name contains invalid characters")); } Ok(())