* Move Obfuscate out of StringExtensions

Author: prupipho

code/src/CoreTemplateStudio/CoreTemplateStudio.Core/Extensions/StringExtensions.cs

@@ -13,33 +13,6 @@ namespace Microsoft.Templates.Core
 {
     public static class StringExtensions
     {
-        public static string Obfuscate(this string data)
-        {
-            string result = data;
-            byte[] b64data = Encoding.UTF8.GetBytes(data);
-
-            using (SHA512 sha2 = SHA512.Create())
-            {
-                result = GetHash(sha2, b64data);
-            }
-
-            return result.ToUpperInvariant();
-        }
-
-        private static string GetHash(HashAlgorithm md5Hash, byte[] inputData)
-        {
-            byte[] data = md5Hash.ComputeHash(inputData);
-
-            var sb = new StringBuilder();
-
-            for (int i = 0; i < data.Length; i++)
-            {
-                sb.Append(data[i].ToString("x2"));
-            }
-
-            return sb.ToString();
-        }
-
         public static string[] GetMultiValue(this string value)
         {
             if (string.IsNullOrWhiteSpace(value) || string.IsNullOrEmpty(value.Trim()))

code/src/CoreTemplateStudio/CoreTemplateStudio.Core/Packaging/TemplatePackage.cs

@@ -11,6 +11,7 @@
 using System.Security;
 using System.Security.Cryptography;
 using System.Security.Cryptography.X509Certificates;
+using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
 
@@ -262,7 +263,7 @@ public List<CertInfo> GetCertsInfo(string signedPackageFilename)
                     var certInfo = new CertInfo()
                     {
                            Cert = new X509Certificate2(cert),
-                           Pin = cert.GetPublicKeyString().Obfuscate(),
+                           Pin = Obfuscate(cert.GetPublicKeyString()),
                            Status = _digitalSignatureService.VerifyCertificate(cert),
                     };
 
@@ -340,11 +341,43 @@ private bool VerifyCertificate(X509Certificate cert)
             return status == X509ChainStatusFlags.NoError;
         }
 
+        private static string GetHash(HashAlgorithm md5Hash, byte[] inputData)
+        {
+            byte[] data = md5Hash.ComputeHash(inputData);
+
+            var sb = new StringBuilder();
+
+            for (int i = 0; i < data.Length; i++)
+            {
+                sb.Append(data[i].ToString("x2"));
+            }
+
+            return sb.ToString();
+        }
+
+        private static string Obfuscate(string data)
+        {
+            if (string.IsNullOrWhiteSpace(data))
+            {
+                return string.Empty;
+            }
+
+            string result = data;
+            byte[] b64data = Encoding.UTF8.GetBytes(data);
+
+            using (SHA512 sha2 = SHA512.Create())
+            {
+                result = GetHash(sha2, b64data);
+            }
+
+            return result.ToUpperInvariant();
+        }
+
         private bool VerifyAllowedPublicKey(X509Certificate cert)
         {
             var pubKeyCert = cert.GetPublicKeyString();
 
-            var pubKeyPin = pubKeyCert.Obfuscate();
+            var pubKeyPin = Obfuscate(pubKeyCert);
 
             AppHealth.Current.Verbose.TrackAsync($"{StringRes.PackageCertificateString} {cert.Subject}").FireAndForget();
             AppHealth.Current.Verbose.TrackAsync($"Key: {pubKeyCert}").FireAndForget();

code/test/CoreTemplateStudio.Core.Test/Extensions/StringExtensionsTests.cs

@@ -11,55 +11,6 @@ namespace Microsoft.Templates.Core.Test.Extensions
     [Trait("ExecutionSet", "Minimum")]
     public class StringExtensionsTests
     {
-        [Theory]
-        [InlineData("string")]
-        [InlineData("string23TEST")]
-        [InlineData(" string23TEST")]
-        [InlineData("string23TEST ")]
-        [InlineData("str ing23TEST")]
-        public void Obfuscate_ShouldNotBeEmpty(string value)
-        {
-            var actual = value.Obfuscate();
-
-            Assert.NotEmpty(actual);
-        }
-
-        [Theory]
-        [InlineData("string")]
-        [InlineData("string23TEST")]
-        [InlineData(" string23TEST")]
-        [InlineData("string23TEST ")]
-        [InlineData("str ing23TEST")]
-        public void Obfuscate_ShouldNotEqualTheOriginalValue(string value)
-        {
-            var actual = value.Obfuscate();
-
-            Assert.False(value.Equals(actual, StringComparison.Ordinal));
-        }
-
-        [Theory]
-        [InlineData("string")]
-        [InlineData("string23TEST")]
-        [InlineData(" string23TEST")]
-        [InlineData("string23TEST ")]
-        [InlineData("str ing23TEST")]
-        public void Obfuscate_ShouldHaveBeenConvertedToUppercase(string value)
-        {
-            var actual = value.Obfuscate();
-
-            Assert.DoesNotContain(actual, c => char.IsLower(c));
-        }
-
-        [Fact(Skip = "Control null and empty scenarios")]
-        public void Obfuscate_Null_ShouldBeControlled()
-        {
-            // var actual = value.Obfuscate();
-
-            // control these scenarios.
-            // used from PackagePackage > VerifyAllowedPublicKey
-            // used from PackagePackage > GetCertsInfo
-        }
-
         [Theory]
         [InlineData("")]
         [InlineData(" ")]

code/test/CoreTemplateStudio.Core.Test/Helpers/LogFixture.cs

@@ -10,7 +10,7 @@
 
 namespace Microsoft.Templates.Core.Test.Helpers.FsTests.Helpers
 {
-    [SuppressMessage("Design", "CA1063:Implement IDisposable Correctly", Justification = "Testing purposes")]
+    [SuppressMessage("Design", "CA1063:Implement IDisposable Correctly", Justification = "Testing purposes only")]
     public class LogFixture : IDisposable
     {
         public string LogFile { get; private set; }
@@ -19,7 +19,7 @@ public class LogFixture : IDisposable
 
         public LogFixture()
         {
-            TestFolderPath = Path.Combine(Environment.CurrentDirectory, "TestFolderPath");
+            TestFolderPath = Path.Combine(Environment.CurrentDirectory, "TempTestData");
             Directory.CreateDirectory(TestFolderPath);
 
             LogFile = Path.Combine(
@@ -61,6 +61,7 @@ public bool IsErrorMessageInLogFile(DateTime logDate, string errorLevel, string
             return false;
         }
 
+        [SuppressMessage("Usage", "CA1816:Dispose methods should call SuppressFinalize", Justification = "Testing purposes only")]
         public void Dispose()
         {
             if (Directory.Exists(TestFolderPath))