Merge 3bf814c into b0f2d43

Author: rcpokorny

CHANGELOG.md

@@ -1,3 +1,8 @@
+2.6.1
+* documentation updates for the 2.6 release
+* fix a naming typo in the 2.5 migration SQL script
+* 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.

IISU/ImplementedStoreTypes/WinIIS/IISBindingInfo.cs

@@ -42,13 +42,22 @@ public IISBindingInfo(Dictionary<string, object> bindingInfo)
 
         private string MigrateSNIFlag(string input)
         {
-            // Check if the input is numeric, if so, just return it as an integer
             if (int.TryParse(input, out int numericValue))
             {
                 return numericValue.ToString();
             }
 
-            if (string.IsNullOrEmpty(input)) { throw new ArgumentNullException("SNI/SSL Flag", "The SNI or SSL Flag flag must not be empty or null."); }
+            if (string.IsNullOrEmpty(input))
+                throw new ArgumentNullException("SNI/SSL Flag", "The SNI or SSL Flag must not be empty or null.");
+
+            // Normalize input
+            var trimmedInput = input.Trim().ToLowerInvariant();
+
+            // Handle boolean values
+            if (trimmedInput == "true")
+                return "1";
+            if (trimmedInput == "false")
+                return "0";
 
             // Handle the string cases
             switch (input.ToLower())

IISU/ImplementedStoreTypes/WinIIS/Inventory.cs

@@ -107,7 +107,7 @@ public JobResult ProcessJob(InventoryJobConfiguration jobConfiguration, SubmitIn
             {
                 _logger.LogTrace(LogHandler.FlattenException(ex));
 
-                var failureMessage = $"Inventory job failed for Site '{jobConfiguration.CertificateStoreDetails.StorePath}' on server '{jobConfiguration.CertificateStoreDetails.ClientMachine}' with error: '{LogHandler.FlattenException(ex)}'";
+                var failureMessage = $"Inventory job failed for Site '{jobConfiguration.CertificateStoreDetails.StorePath}' on server '{jobConfiguration.CertificateStoreDetails.ClientMachine}' with error: '{ex.Message}'";
                 _logger.LogWarning(failureMessage);
 
                 return new JobResult

IISU/ImplementedStoreTypes/WinIIS/Management.cs

@@ -103,13 +103,16 @@ public JobResult ProcessJob(ManagementJobConfiguration config)
                                 {
                                     string newThumbprint = AddCertificate(certificateContents, privateKeyPassword, cryptoProvider);
                                     _logger.LogTrace($"Completed adding the certificate to the store");
+                                    _logger.LogTrace($"New thumbprint: {newThumbprint}");
 
                                     // Bind Certificate to IIS Site
                                     if (newThumbprint != null)
                                     {
                                         IISBindingInfo bindingInfo = new IISBindingInfo(config.JobProperties);
                                         WinIISBinding.BindCertificate(_psHelper, bindingInfo, newThumbprint, "", _storePath);
 
+                                        _logger.LogTrace("Returned after binding certificate to store");
+
                                         complete = new JobResult
                                         {
                                             Result = OrchestratorJobStatusJobResult.Success,

IISU/ImplementedStoreTypes/WinIIS/WinIISBinding.cs

@@ -49,25 +49,39 @@ public static void BindCertificate(PSHelper psHelper, IISBindingInfo bindingInfo
             // Optional parameters
             if (!string.IsNullOrEmpty(bindingInfo.HostName)) { parameters.Add("HostName", bindingInfo.HostName); }
 
-            _results = psHelper.ExecutePowerShell("New-KFIISSiteBinding", parameters);      // returns true if successful
-            _logger.LogTrace("Returned from executing PS function (New-KFIISSiteBinding)");
-
-            // This should return the thumbprint of the certificate
-            if (_results != null && _results.Count > 0)
+            try
             {
-                bool success = _results[0].BaseObject is bool value && value;
-                if (success)
+                _results = psHelper.ExecutePowerShell("New-KFIISSiteBinding", parameters);      // returns true if successful
+                _logger.LogTrace("Returned from executing PS function (New-KFIISSiteBinding)");
+
+                if (_results != null && _results.Count > 0)
                 {
-                    _logger.LogTrace($"Bound certificate with the thumbprint: '{thumbprint}' to site: '{bindingInfo.SiteName}' successfully.");
-                    return;
+                    var baseObject = _results[0]?.BaseObject;
+                    if (baseObject is bool value)
+                    {
+                        if (value)
+                        {
+                            _logger.LogTrace($"Bound certificate with the thumbprint: '{thumbprint}' to site: '{bindingInfo.SiteName}' successfully.");
+                        }
+                        else
+                        {
+                            _logger.LogTrace("Something happened and the binding failed.");
+                        }
+                    }
+                    else
+                    {
+                        _logger.LogWarning("Unexpected result type returned from script: " + baseObject?.GetType().Name);
+                    }
                 }
                 else
                 {
-                    _logger.LogTrace("Something happened and the binding failed.");
+                    _logger.LogWarning("PowerShell script returned no results.");
                 }
             }
-
-            throw new Exception($"An unknown error occurred while attempting to bind thumbprint: {thumbprint} to site: '{bindingInfo.SiteName}'. \nCheck the UO Logs for more information.");
+            catch (Exception ex)
+            {
+                throw new Exception($"An unknown error occurred while attempting to bind thumbprint: {thumbprint} to site: '{bindingInfo.SiteName}'. \n{ex.Message}");
+            }
         }
 
         public static bool UnBindCertificate(PSHelper psHelper, IISBindingInfo bindingInfo)

IISU/PSHelper.cs

@@ -181,20 +181,28 @@ private void InitializeRemoteSession()
             else
             {
                 _logger.LogTrace("Initializing WinRM connection");
-                var pw = new NetworkCredential(serverUserName, serverPassword).SecurePassword;
-                PSCredential myCreds = new PSCredential(serverUserName, pw);
+                try
+                {
+                    var pw = new NetworkCredential(serverUserName, serverPassword).SecurePassword;
+                    PSCredential myCreds = new PSCredential(serverUserName, pw);
 
-                // Create the PSSessionOption object
-                var sessionOption = new PSSessionOption
+                    // Create the PSSessionOption object
+                    var sessionOption = new PSSessionOption
+                    {
+                        IncludePortInSPN = useSPN
+                    };
+
+                    PS.AddCommand("New-PSSession")
+                    .AddParameter("ComputerName", ClientMachineName)
+                    .AddParameter("Port", port)
+                    .AddParameter("Credential", myCreds)
+                    .AddParameter("SessionOption", sessionOption);
+                }
+                catch (Exception)
                 {
-                    IncludePortInSPN = useSPN
-                };
+                    throw new Exception("Problems establishing network credentials.  Please check the User name and Password for the Certificate Store");
+                }
 
-                PS.AddCommand("New-PSSession")
-                .AddParameter("ComputerName", ClientMachineName)
-                .AddParameter("Port", port)
-                .AddParameter("Credential", myCreds)
-                .AddParameter("SessionOption", sessionOption);
             }
 
             using var cts = new CancellationTokenSource(TimeSpan.FromSeconds(10));