feat(types): Custom endpoint deny oss prefix

src/config.rs

@@ -125,10 +125,19 @@ impl FromStr for BucketBase {
     /// ```
     /// # use aliyun_oss_client::config::BucketBase;
     /// # use aliyun_oss_client::types::EndPoint;
+    /// # use std::borrow::Cow;
     /// let bucket: BucketBase = "abc.oss-cn-shanghai.aliyuncs.com".parse().unwrap();
     /// assert_eq!(bucket.name(), "abc");
     /// assert_eq!(bucket.endpoint(), EndPoint::CnShanghai);
     ///
+    /// let bucket: BucketBase = "abc.oss-cn-jinan.aliyuncs.com".parse().unwrap();
+    /// assert_eq!(bucket.name(), "abc");
+    /// assert_eq!(bucket.endpoint(), EndPoint::Other(Cow::Borrowed("cn-jinan")));
+    ///
+    /// let bucket: BucketBase = "abc.oss-cn-jinan".parse().unwrap();
+    /// assert_eq!(bucket.name(), "abc");
+    /// assert_eq!(bucket.endpoint(), EndPoint::Other(Cow::Borrowed("cn-jinan")));
+    ///
     /// assert!("abc*#!".parse::<BucketBase>().is_err());
     /// assert!("abc".parse::<BucketBase>().is_err());
     /// ```
@@ -147,10 +156,14 @@ impl FromStr for BucketBase {
         }
 
         let (bucket, endpoint) = domain.split_once('.').ok_or(InvalidBucketBase::Tacitly)?;
+        let endpoint = match endpoint.find('.') {
+            Some(s) => &endpoint[0..s],
+            None => endpoint,
+        };
 
         Ok(Self {
             name: BucketName::from_static(bucket)?,
-            endpoint: EndPoint::new(endpoint)?,
+            endpoint: EndPoint::new(endpoint.trim_start_matches("oss-"))?,
         })
     }
 }

src/types.rs

@@ -323,6 +323,8 @@ impl<'a> EndPoint {
     /// assert!(EndPoint::new("-abc").is_err());
     /// assert!(EndPoint::new("abc-def234ab").is_ok());
     /// assert!(EndPoint::new("abc-def*#$%^ab").is_err());
+    /// assert!(EndPoint::new("cn-jinan").is_ok());
+    /// assert!(EndPoint::new("oss-cn-jinan").is_err());
     /// ```
     pub fn new(url: &'a str) -> Result<Self, InvalidEndPoint> {
         use EndPoint::*;
@@ -355,6 +357,11 @@ impl<'a> EndPoint {
             if url.starts_with('-') || url.ends_with('-') {
                 return Err(InvalidEndPoint);
             }
+
+            if url.starts_with("oss") {
+                return Err(InvalidEndPoint);
+            }
+
             fn valid_character(c: char) -> bool {
                 match c {
                     _ if c.is_ascii_lowercase() => true,
@@ -462,7 +469,10 @@ impl Error for InvalidEndPoint {}
 #[cfg(feature = "core")]
 impl fmt::Display for InvalidEndPoint {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        write!(f, "endpoint must like with https://xxx.aliyuncs.com")
+        write!(
+            f,
+            "endpoint must not with `-` prefix or `-` suffix or `oss-` prefix"
+        )
     }
 }