add validate

Author: liaoyustudent

aliyun-net-sdk-core.Tests/Units/AcsRequest.cs

@@ -17,6 +17,7 @@
  * under the License.
  */
 
+using System;
 using System.Collections.Generic;
 
 using Aliyun.Acs.Core.Auth;
@@ -88,6 +89,9 @@ public void GetEndpoint()
             mockAcsRequest.ProductNetwork = "vpc";
             Assert.Equal("test-vpc.aliyuncs.com", mockAcsRequest.GetProductEndpoint());
 
+            mockAcsRequest.ProductSuffix = "suffix";
+            Assert.Equal("testsuffix-vpc.aliyuncs.com", mockAcsRequest.GetProductEndpoint());
+
             var productEndpointMap = new Dictionary<string, string>();
             mockAcsRequest.ProductEndpointType = "test-type";
             mockAcsRequest.ProductEndpointMap = productEndpointMap;
@@ -177,6 +181,30 @@ public void UserAgentConfigTest()
 
             Assert.Equal(resultStr, userAgent);
         }
+
+        [Fact]
+        public void validateParam()
+        {
+            var acsRequest = new MockAcsRequest();
+            Assert.Throws<ArgumentException>(() =>
+            {
+                acsRequest.RegionId = "a.b";
+            });
+
+            acsRequest.RegionId = "";
+            Assert.Throws<ArgumentException>(() =>
+            {
+                acsRequest.ProductNetwork = "a.b";
+            });
+
+            acsRequest.ProductNetwork = "private";
+            Assert.Equal("private", acsRequest.ProductNetwork);
+
+            Assert.Throws<ArgumentException>(() =>
+            {
+                acsRequest.ProductSuffix = "a.b";
+            });
+        }
     }
 
     public sealed class MockAcsRequest : AcsRequest<CommonRequest>

aliyun-net-sdk-core/AcsRequest.cs

@@ -17,8 +17,10 @@
  * under the License.
  */
 
+using System;
 using System.Collections.Generic;
 using System.Text;
+using System.Text.RegularExpressions;
 
 using Aliyun.Acs.Core.Auth;
 using Aliyun.Acs.Core.Http;
@@ -36,12 +38,15 @@ public abstract class AcsRequest<T> : HttpRequest
 
         private Dictionary<string, string> domainParameters = new Dictionary<string, string>();
 
-        public string ProductNetwork = "public";
+        private string productNetwork = "public";
+
+        private string productSuffix;
 
         private ProtocolType protocol = ProtocolType.HTTP;
 
         private Dictionary<string, string> queryParameters = new Dictionary<string, string>();
 
+        private string regionId;
 
         public string StringToSign;
         private UserAgent userAgentConfig;
@@ -56,13 +61,62 @@ public AcsRequest(string product) : base(null)
         public virtual string Product { get; set; }
         public virtual string Version { get; set; }
         public virtual string ActionName { get; set; }
-        public virtual string RegionId { get; set; }
+        public virtual string RegionId
+        {
+            get
+            {
+                return regionId;
+            }
+            set
+            {
+                var match = Regex.Match(value, "^[a-zA-Z0-9_-]*$");
+                if (!match.Success)
+                {
+                    throw new ArgumentException("regionId is invalid", "regionId");
+                }
+                regionId = value;
+            }
+        }
         public virtual string SecurityToken { get; set; }
         public ISignatureComposer Composer { get; set; }
         public string LocationProduct { get; set; }
         public string LocationEndpointType { get; set; }
         public ProductDomain ProductDomain { get; set; }
 
+        public string ProductNetwork
+        {
+            get
+            {
+                return productNetwork;
+            }
+            set
+            {
+                var match = Regex.Match(value, "^[a-zA-Z0-9_-]+$");
+                if (!match.Success)
+                {
+                    throw new ArgumentException("productNetwork is invalid", "productNetwork");
+                }
+                productNetwork = value;
+            }
+        }
+
+        public string ProductSuffix
+        {
+            get
+            {
+                return productSuffix;
+            }
+            set
+            {
+                var match = Regex.Match(value, "^[a-zA-Z0-9_-]+$");
+                if (!match.Success)
+                {
+                    throw new ArgumentException("productSuffix is invalid", "productSuffix");
+                }
+                productSuffix = value;
+            }
+        }
+
         public virtual FormatType AcceptFormat
         {
             get { return acceptFormat; }
@@ -110,13 +164,13 @@ public void SetProductDomain(string endpoint = "")
 
             if (endpoint != "" && ProductDomain == null)
             {
-                ProductDomain = new ProductDomain {ProductName = Product, DomainName = endpoint};
+                ProductDomain = new ProductDomain { ProductName = Product, DomainName = endpoint };
             }
         }
 
         public void SetEndpoint(string endpoint)
         {
-            ProductDomain = new ProductDomain {ProductName = Product, DomainName = endpoint};
+            ProductDomain = new ProductDomain { ProductName = Product, DomainName = endpoint };
         }
 
         public string GetProductEndpoint()
@@ -137,24 +191,33 @@ public string GetProductEndpoint()
             var endpoint = "";
             if (ProductEndpointType == "central")
             {
-                endpoint = "<product_id><network>.aliyuncs.com";
+                endpoint = "<product_id><suffix><network>.aliyuncs.com";
             }
             else if (ProductEndpointType == "regional")
             {
-                endpoint = "<product_id><network>.<region_id>.aliyuncs.com";
+                endpoint = "<product_id><suffix><network>.<region_id>.aliyuncs.com";
                 endpoint = endpoint.Replace("<region_id>", RegionId);
             }
 
+            if (string.IsNullOrWhiteSpace(ProductSuffix))
+            {
+                endpoint = endpoint.Replace("<suffix>", string.Empty);
+            }
+            else
+            {
+                endpoint = endpoint.Replace("<suffix>", ProductSuffix);
+            }
+
             if (endpoint == "")
             {
                 return "";
             }
 
             endpoint = endpoint.Replace("<product_id>", Product.ToLower());
 
-            endpoint = ProductNetwork == "public"
-                ? endpoint.Replace("<network>", "")
-                : endpoint.Replace("<network>", "-" + ProductNetwork);
+            endpoint = ProductNetwork == "public" ?
+                endpoint.Replace("<network>", "") :
+                endpoint.Replace("<network>", "-" + ProductNetwork);
 
             return endpoint;
         }

aliyun-net-sdk-core/DefaultAcsClient.cs

@@ -36,8 +36,8 @@
 using Aliyun.Acs.Core.Retry.Condition;
 using Aliyun.Acs.Core.Timeout.Util;
 using Aliyun.Acs.Core.Transform;
-using Aliyun.Acs.Core.Utils;
-
+using Aliyun.Acs.Core.Utils;
+
 namespace Aliyun.Acs.Core
 {
     public class DefaultAcsClient : IAcsClient

aliyun-net-sdk-core/Regions/Endpoints/EndpointResolve.cs

@@ -45,8 +45,14 @@ public List<Endpoint> Resolve(string product, string regionId, string serviceCod
 
                     if (endpoint != null)
                     {
-                        _endpoints.Add(endpoint);
-                        CacheTimeHelper.AddLastClearTimePerProduct(product, regionId, DateTime.UtcNow);
+                        foreach (var region in endpoint.RegionIds)
+                        {
+                            foreach (var productDomain in endpoint.ProductDomains.ToList())
+                            {
+                                AddEndpoint(endpoint.Name, region, product, productDomain.DomainName);
+                                CacheTimeHelper.AddLastClearTimePerProduct(product, region, DateTime.UtcNow);
+                            }
+                        }
                     }
                     else
                     {

aliyun-sdk-feature-test/FeatureTest.cs

@@ -45,9 +45,8 @@ internal class FeatureTest
             accessKeyId,
             accessKeySecret
             );
-
             client = new DefaultAcsClient(profile);
-            client.SetConnectTimeoutInMilliSeconds(2 * 60 * 1000);
+            client.SetConnectTimeoutInMilliSeconds(2 * 60 * 1000);
             client.SetReadTimeoutInMilliSeconds(2 * 60 * 1000);
         }