Merge pull request #29 from AzCiS/onesdk-avirupch

Fix for Bug 2142619
AzureRT · Mar 25, 2015 · 6acc061 · 6acc061
2 parents 3bd1fc6 + e7b9bed
commit 6acc061
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/...mple/Commands.StorSimple/Cmdlets/DataContainer/NewAzureStorSimpleDeviceVolumeContainer.cs b/...mple/Commands.StorSimple/Cmdlets/DataContainer/NewAzureStorSimpleDeviceVolumeContainer.cs
@@ -65,7 +65,7 @@ public override void ExecuteCmdlet()
                     return;
                 }
 
-                if(EncryptionEnabled == true && string.IsNullOrEmpty(EncryptionKey))
+                if(EncryptionEnabled == true && (string.IsNullOrEmpty(EncryptionKey) || !IsValidAsciiString(EncryptionKey)))
                 {
                     throw new ArgumentNullException("EncryptionKey");
                 }

diff --git a/src/ServiceManagement/StorSimple/Commands.StorSimple/StorSimpleCmdletBase.cs b/src/ServiceManagement/StorSimple/Commands.StorSimple/StorSimpleCmdletBase.cs
@@ -25,6 +25,7 @@
 using System.Net;
 using System.Management.Automation;
 using Microsoft.WindowsAzure.Commands.StorSimple.Models;
+using System.Text.RegularExpressions;
 
 namespace Microsoft.WindowsAzure.Commands.StorSimple
 {
@@ -512,5 +513,10 @@ internal bool ValidTargetDeviceForFailover(string sourceDeviceId, string targetD
 
             return true;
         }
+
+        internal bool IsValidAsciiString(string s)
+        {
+            return Regex.IsMatch(s, "[ -~]+");
+        }
     }
 }