Merge branch '2.6_Document_Updates' into ab#67005-migration-script-fix

Author: doebrowsk

CHANGELOG.md

@@ -1,6 +1,12 @@
-2.5.2
+2.6.1
+* documentation updates for the 2.6 release
 * fix a naming typo in the 2.5 migration SQL script
-* remove a field from the integration-manifest.json
+* update integration-manifest.json
+
+2.6.0
+* Added the ability to run the extension in a Linux environment.  To utilize this change, for each Cert Store Types (WinCert/WinIIS/WinSQL), add ssh to the Custom Field <b>WinRM Protocol</b>.  When using ssh as a protocol, make sure to enter the appropriate ssh port number under WinRM Port.
+* NOTE: For legacy purposes the Display names WinRM Protocol and WinRM Port are maintained although the type of protocols now includes ssh.
+* Moved all inventory and management jobs to external PowerShell script file .\PowerShellScripts\WinCertScripts.ps1
 
 2.5.1
 * Fixed WinSQL service name when InstanceID differs from InstanceName

IISU/Certificate.cs

@@ -12,9 +12,11 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+// 021225 rcp   2.6.0   Cleaned up and verified code
+
+using Newtonsoft.Json;
 using System;
-using System.Linq;
-using System.Text.RegularExpressions;
+using System.Collections.Generic;
 
 namespace Keyfactor.Extensions.Orchestrator.WindowsCertStore
 {
@@ -29,30 +31,27 @@ public class Certificate
 
         public class Utilities
         {
-            public static string FormatSAN(string san)
+            public static List<T> DeserializeCertificates<T>(string jsonResults)
             {
-                // Use regular expression to extract key-value pairs
-                var regex = new Regex(@"(?<key>DNS Name|Email|IP Address)=(?<value>[^=,\s]+)");
-                var matches = regex.Matches(san);
-
-                // Format matches into the desired format  
-                string result = string.Join("&", matches.Cast<Match>()
-                    .Select(m => $"{NormalizeKey(m.Groups["key"].Value)}={m.Groups["value"].Value}"));
-
-                return result;
-            }
+                if (string.IsNullOrEmpty(jsonResults))
+                {
+                    // Handle no objects returned
+                    return new List<T>();
+                }
 
-            private static string NormalizeKey(string key)
-            {
-                return key.ToLower() switch
+                // Determine if the JSON is an array or a single object
+                if (jsonResults.TrimStart().StartsWith("["))
                 {
-                    "dns name" => "dns",
-                    "email" => "email",
-                    "ip address" => "ip",
-                    _ => key.ToLower() // For other types, keep them as-is
-                };
+                    // It's an array, deserialize as list
+                    return JsonConvert.DeserializeObject<List<T>>(jsonResults);
+                }
+                else
+                {
+                    // It's a single object, wrap it in a list
+                    var singleObject = JsonConvert.DeserializeObject<T>(jsonResults);
+                    return new List<T> { singleObject };
+                }
             }
-
         }
     }
 }