Dev 2304

sdk/Domain/PolicyConditions.cs

@@ -89,10 +89,10 @@ public override string Jsonize()
             switch (TupleType)
             {
                 case TupleType.Two:
-                    jsonizedCond = String.Format("{{\"{0}\":\"{1}\"}},", Name, Value);
+                    jsonizedCond = String.Format("{{\"{0}\":\"{1}\"}},", Util.HttpUtils.JsonEscapeString(Name), Util.HttpUtils.JsonEscapeString(Value));
                     break;
                 case TupleType.Three:
-                    jsonizedCond = String.Format("[\"eq\",\"${0}\",\"{1}\"],", Name, Value);
+                    jsonizedCond = String.Format("[\"eq\",\"${0}\",\"{1}\"],", Util.HttpUtils.JsonEscapeString(Name), Util.HttpUtils.JsonEscapeString(Value));
                     break;
                 default:
                     throw new InvalidEnumArgumentException("Invalid tuple type " + TupleType.ToString());
@@ -116,7 +116,7 @@ public StartWithConditionItem(string name, string value)
 
         public override string Jsonize()
         {
-            return String.Format("[\"starts-with\",\"${0}\",\"{1}\"],", Name, Value);
+            return String.Format("[\"starts-with\",\"${0}\",\"{1}\"],", Util.HttpUtils.JsonEscapeString(Name), Util.HttpUtils.JsonEscapeString(Value));
         }
     }
 

sdk/Domain/RestoreObjectRequest.cs

@@ -9,7 +9,7 @@ namespace Aliyun.OSS
     public class RestoreObjectRequest
     {
         private int _day = 1;
-        private TierType _tierType = TierType.Standard;
+        private TierType? _tierType = TierType.Standard;
         private bool _defaultParameter = true;
 
         /// <summary>
@@ -44,7 +44,7 @@ public int Days
         /// <summary>
         /// Gets or sets the TierType
         /// </summary>
-        public TierType Tier
+        public TierType? Tier
         {
             get { return _tierType; }
             set { _tierType = value; _defaultParameter = false; }

sdk/Transform/RestoreObjectRequestSerializer.cs

@@ -20,8 +20,10 @@ public override Stream Serialize(RestoreObjectRequest request)
         {
             var model = new RestoreRequestModel();
             model.Days = request.Days;
-            model.JobParameter = new RestoreRequestModel.JobParameters();
-            model.JobParameter.Tier = request.Tier;
+            if (request.Tier != null) { 
+                model.JobParameter = new RestoreRequestModel.JobParameters();
+                model.JobParameter.Tier = request.Tier.Value;
+            }
             return ContentSerializer.Serialize(model);
         }
     }

sdk/Util/HttpUtils.cs

@@ -131,5 +131,65 @@ public static string GetContentType(string key, string file)
 
             return DefaultContentType;
         }
+
+        public static string JsonEscapeString(string src)
+        {
+            if (src == null)
+                return null;
+
+            for (int i = 0; i < src.Length; i++)
+                if (JsonNeedEscape(src, i))
+                {
+                    var sb = new StringBuilder();
+                    if (i > 0)
+                        sb.Append(src, 0, i);
+                    return JsonDoEscapeString(sb, src, i);
+                }
+            return src;
+        }
+
+        internal static bool JsonNeedEscape(string src, int i)
+        {
+            char c = src[i];
+            return c < 32 || c == '"' || c == '\\'
+                // Broken lead surrogate
+                || (c >= '\uD800' && c <= '\uDBFF' &&
+                    (i == src.Length - 1 || src[i + 1] < '\uDC00' || src[i + 1] > '\uDFFF'))
+                // Broken tail surrogate
+                || (c >= '\uDC00' && c <= '\uDFFF' &&
+                    (i == 0 || src[i - 1] < '\uD800' || src[i - 1] > '\uDBFF'))
+                // To produce valid JavaScript
+                || c == '\u2028' || c == '\u2029'
+                // Escape "</" for <script> tags
+                || (c == '/' && i > 0 && src[i - 1] == '<');
+        }
+
+        internal static string JsonDoEscapeString(StringBuilder sb, string src, int cur)
+        {
+            int start = cur;
+            for (int i = cur; i < src.Length; i++)
+                if (JsonNeedEscape(src, i))
+                {
+                    sb.Append(src, start, i - start);
+                    switch (src[i])
+                    {
+                        case '\b': sb.Append("\\b"); break;
+                        case '\f': sb.Append("\\f"); break;
+                        case '\n': sb.Append("\\n"); break;
+                        case '\r': sb.Append("\\r"); break;
+                        case '\t': sb.Append("\\t"); break;
+                        case '\"': sb.Append("\\\""); break;
+                        case '\\': sb.Append("\\\\"); break;
+                        case '/': sb.Append("\\/"); break;
+                        default:
+                            sb.Append("\\u");
+                            sb.Append(((int)src[i]).ToString("x04"));
+                            break;
+                    }
+                    start = i + 1;
+                }
+            sb.Append(src, start, src.Length - start);
+            return sb.ToString();
+        }
     }
 }

test/TestCase/ObjectTestCase/ObjectBasicOperationTest.cs

@@ -1,9 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
-using Aliyun.OSS;
 using Aliyun.OSS.Common;
-using Aliyun.OSS.Common.Communication;
 using Aliyun.OSS.Model;
 using Aliyun.OSS.Util;
 using Aliyun.OSS.Test.Util;
@@ -12,6 +10,7 @@
 using System.Text;
 using System.Net;
 using System.Threading;
+using System.Collections.Specialized;
 
 namespace Aliyun.OSS.Test.TestClass.ObjectTestClass
 {
@@ -2562,6 +2561,75 @@ public void GeneratePostPolicyTest()
             Assert.AreNotEqual(policy.IndexOf("expiration"), -1);
         }
 
+        [Test]
+        public void UsePostPolicyUploadDataTest()
+        {
+            var actualPostPolicy = "";
+            var encodePolicy = "";
+            var signature = "";
+
+            var fileName = "1.png\"},{\"key\":\"2.png\"}]}//";
+            var key = "4.png\"},{\"key\":\"5.png\"}]}//";
+            var bucketName = _bucketName;
+
+            var conds = new PolicyConditions();
+            conds.AddConditionItem("bucket", bucketName);
+            conds.AddConditionItem("fileName", fileName);
+            conds.AddConditionItem(MatchMode.Exact, PolicyConditions.CondKey, key);
+            actualPostPolicy = _ossClient.GeneratePostPolicy(DateTime.UtcNow.AddSeconds(3600), conds); ;
+            encodePolicy = Convert.ToBase64String(Encoding.Default.GetBytes(actualPostPolicy));
+            signature = Common.Authentication.ServiceSignature.Create().ComputeSignature(Config.AccessKeySecret, encodePolicy);
+
+            var endpoint = Config.Endpoint;
+            var urlStr = "";
+            if (endpoint.StartsWith("http://"))
+            {
+                urlStr = "http://" + bucketName + "." + endpoint.Substring(7);
+            } 
+            else if (endpoint.StartsWith("https://"))
+            {
+                urlStr = "https://" + bucketName + "." + endpoint.Substring(8);
+            }
+            else { 
+                urlStr = "http://" + bucketName + "." + endpoint;
+            }
+
+            Dictionary<String, String> header = new Dictionary<string, string>();
+
+
+            // upload ok
+            try {
+                NameValueCollection nameValues = new NameValueCollection();
+                nameValues.Add("key", key);
+                nameValues.Add("fileName", fileName);
+                nameValues.Add("OSSAccessKeyId", Config.AccessKeyId);
+                nameValues.Add("policy", encodePolicy);
+                nameValues.Add("Signature", signature);
+                PostMultipartFormData(urlStr, header, nameValues, "image/jpg", "1.jpeg", Encoding.Default.GetBytes("hello"));
+            }
+            catch(Exception e)
+            {
+                Assert.IsTrue(false, e.Message);
+            }
+
+            // upload fail
+            try
+            {
+                NameValueCollection nameValues = new NameValueCollection();
+                nameValues.Add("key", "1.txt");
+                nameValues.Add("fileName", fileName);
+                nameValues.Add("OSSAccessKeyId", Config.AccessKeyId);
+                nameValues.Add("policy", encodePolicy);
+                nameValues.Add("Signature", signature);
+                PostMultipartFormData(urlStr, header, nameValues, "image/jpg", "1.jpeg", Encoding.Default.GetBytes("hello"));
+                Assert.IsTrue(false, "should not here");
+            }
+            catch (Exception e)
+            {
+                Assert.IsTrue(true, e.Message);
+            }
+
+        }
 
         #endregion
 
@@ -2619,6 +2687,65 @@ private static void AppendObjectCallback(IAsyncResult ar)
                 _event.Set();
             }
         }
+
+        private static void PostMultipartFormData(string url,
+            Dictionary<string, string> headers,
+            NameValueCollection nameValueCollection,
+            string contentType, string fileName, byte[] fileData)
+        {
+            string boundary = "9431149156168";
+            string Enter = "\r\n";
+            HttpWebRequest request = (HttpWebRequest)WebRequest.Create(url);
+            request.Method = "POST";
+
+            //add header
+            foreach (var item in headers)
+            {
+                request.Headers.Add(item.Key, item.Value);
+            }
+
+            request.ContentType = "multipart/form-data;boundary=" + boundary;
+
+            Stream myRequestStream = request.GetRequestStream();
+
+            // key & value
+            string[] allKeys = nameValueCollection.AllKeys;
+            foreach (string key in allKeys)
+            {
+                string filedValue = "--" + boundary + Enter
+                    + "Content-Disposition: form-data; name=\"" + key + "\"" + Enter + Enter
+                    + nameValueCollection[key] + Enter;
+
+                var bytes = Encoding.UTF8.GetBytes(filedValue);
+                myRequestStream.Write(bytes, 0, bytes.Length);
+            }
+
+            // data front 
+            string dataFiledBegin = "--" + boundary + Enter
+                    + "Content-Disposition: form-data; name=\"file\"; " + "filename=\"" + fileName + "\""+ Enter + Enter
+                    + "Content-Type: " + contentType + Enter + Enter;
+            var data_bytes = Encoding.UTF8.GetBytes(dataFiledBegin);
+            myRequestStream.Write(data_bytes, 0, data_bytes.Length);
+
+            // data 
+            myRequestStream.Write(fileData, 0, fileData.Length);
+
+            // data end
+            string dataFiledEnd = Enter + "--" + boundary + "--";
+            data_bytes = Encoding.UTF8.GetBytes(dataFiledEnd);
+            myRequestStream.Write(data_bytes, 0, data_bytes.Length);
+
+            //send data
+            HttpWebResponse response = (HttpWebResponse)request.GetResponse();
+
+            Stream myResponseStream = response.GetResponseStream();
+            StreamReader myStreamReader = new StreamReader(myResponseStream, Encoding.GetEncoding("utf-8"));
+
+            myStreamReader.ReadToEnd();
+            myStreamReader.Close();
+            myResponseStream.Close();
+        }
+
         #endregion
     };
 }

test/TestCase/ObjectTestCase/ObjectProcessTest.cs

@@ -41,7 +41,8 @@ public static void ClassInitialize()
             _process = "image/resize,m_fixed,w_100,h_100";
             _localImageFile = Config.ImageTestFile;
             _processedKey = "process/image" + _keyName;
-            _imageInfo = "{\n    \"FileSize\": {\"value\": \"3267\"},\n    \"Format\": {\"value\": \"jpg\"},\n    \"ImageHeight\": {\"value\": \"100\"},\n    \"ImageWidth\": {\"value\": \"100\"},\n    \"ResolutionUnit\": {\"value\": \"1\"},\n    \"XResolution\": {\"value\": \"1/1\"},\n    \"YResolution\": {\"value\": \"1/1\"}}";
+            //_imageInfo = "{\n    \"FileSize\": {\"value\": \"3267\"},\n    \"Format\": {\"value\": \"jpg\"},\n    \"ImageHeight\": {\"value\": \"100\"},\n    \"ImageWidth\": {\"value\": \"100\"},\n    \"ResolutionUnit\": {\"value\": \"1\"},\n    \"XResolution\": {\"value\": \"1/1\"},\n    \"YResolution\": {\"value\": \"1/1\"}}";
+            _imageInfo = "{\n    \"FileSize\": {\"value\": \"3267\"},\n    \"Format\": {\"value\": \"jpg\"},\n    \"FrameCount\": {\"value\": \"1\"},\n    \"ImageHeight\": {\"value\": \"100\"},\n    \"ImageWidth\": {\"value\": \"100\"},\n    \"ResolutionUnit\": {\"value\": \"1\"},\n    \"XResolution\": {\"value\": \"1/1\"},\n    \"YResolution\": {\"value\": \"1/1\"}}";
         }
 
         [OneTimeTearDown]

test/TestCase/ObjectTestCase/ObjectVersioningTest.cs

@@ -395,15 +395,16 @@ public void AppendObjectWithVersioningEnableTest()
             };
 
             var aResult = _ossClient.AppendObject(aRequest);
-            Assert.AreEqual(aResult.VersionId, "null");
+            var versionId = aResult.VersionId;
+            Assert.AreEqual(aResult.VersionId.Length > 5, true);
 
             aRequest = new AppendObjectRequest(_bucketName, key)
             {
                 Content = content2,
                 Position = aResult.NextAppendPosition
             };
             aResult = _ossClient.AppendObject(aRequest);
-            Assert.AreEqual(aResult.VersionId, "null");
+            Assert.AreEqual(aResult.VersionId, versionId);
         }
 
         [Test]

test/aliyun-oss-sdk-test-dotnetcore.csproj

@@ -23,7 +23,11 @@
     <DefineConstants>TRACE;TEST_DOTNETCORE</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="coverlet.msbuild" Version="2.9.0">
+    <PackageReference Include="coverlet.collector" Version="3.2.0">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+    <PackageReference Include="coverlet.msbuild" Version="3.2.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
@@ -98,5 +102,11 @@
     <None Update="example.jpg">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
+    <None Update="sample_data.csv">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Update="sample_data.csv.gz">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
   </ItemGroup>
 </Project>

test/aliyun-oss-sdk-test.csproj

@@ -114,6 +114,12 @@
     <Content Include="example.jpg">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
+    <Content Include="sample_data.csv">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+    <Content Include="sample_data.csv.gz">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\sdk\aliyun-oss-sdk.csproj">