Fixed Azure table property being not sanitized.

dotnet · Feb 5, 2016 · 2e2b5ca · ponsakthi · Feb 19, 2016 · 2e2b5ca
1 parent 5d63928
commit 2e2b5ca
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/src/OrleansAzureUtils/Storage/AzureStorageUtils.cs b/src/OrleansAzureUtils/Storage/AzureStorageUtils.cs
@@ -275,10 +275,11 @@ public static string SanitizeTableProperty(string key)
         {
             // Remove any characters that can't be used in Azure PartitionKey or RowKey values
             // http://www.jamestharpe.com/web-development/azure-table-service-character-combinations-disallowed-in-partitionkey-rowkey/
-            key.Replace('/', '_');  // Forward slash
-            key.Replace('\\', '_'); // Backslash
-            key.Replace('#', '_');  // Pound sign
-            key.Replace('?', '_');  // Question mark
+            key = key
+                .Replace('/', '_')        // Forward slash
+                .Replace('\\', '_')       // Backslash
+                .Replace('#', '_')        // Pound sign
+                .Replace('?', '_');       // Question mark
 
             if (key.Length >= 1024)
                 throw new ArgumentException(string.Format("Key length {0} is too long to be an Azure table key. Key={1}", key.Length, key));

diff --git a/src/TesterInternal/StorageTests/AzureTableErrorCodeTests.cs b/src/TesterInternal/StorageTests/AzureTableErrorCodeTests.cs
@@ -56,5 +56,12 @@ public void AzureTableErrorCode_BadTableName()
             string tableName = "abc-123";
             AzureStorageUtils.ValidateTableName(tableName);
         }
+
+        [TestMethod, TestCategory("Functional"), TestCategory("Azure"), TestCategory("Storage")]
+        public void AzureStorageUtils_TablePropertyShouldBeSanitized()
+        {
+            var tableProperty = "/A\\C#?";
+            Assert.AreEqual("_A_C__", AzureStorageUtils.SanitizeTableProperty(tableProperty));
+        }
     }
 }