Testing SSH on Linux

Author: Bob Pokorny

IISU/ClientPSCertStoreReEnrollment.cs

@@ -89,7 +89,27 @@ public JobResult PerformReEnrollment(ReenrollmentJobConfiguration config, Submit
                 using (_psHelper)
                 {
                     // First create and return the CSR
-                    var csr = CreateCSR(subjectText, providerName, keyType, keySize, SAN);
+                    _logger.LogTrace($"Subject Text: {subjectText}");
+                    _logger.LogTrace($"Provider Name: {providerName}");
+                    _logger.LogTrace($"Key Type: {keyType}");
+                    _logger.LogTrace($"Key Size: {keySize}");
+                    _logger.LogTrace($"SAN: {SAN}");
+
+                    string csr = string.Empty;
+
+                    try
+                    {
+                        _logger.LogTrace("Attempting to Create CSR");
+                        csr = CreateCSR(subjectText, providerName, keyType, keySize, SAN);
+                        _logger.LogTrace("Returned from creating CSR");
+                    }
+                    catch (Exception ex)
+                    {
+                        _logger.LogError($"Error while attempting to create the CSR: {ex.Message}");
+                        throw new Exception("Unable to create the CSR file.  Check the Orchestrator Logs for more information");
+                    }
+
+                    _logger.LogTrace($"CSR Contents: '{csr}'");
 
                     if (csr != string.Empty)
                     {
@@ -158,10 +178,12 @@ public JobResult PerformReEnrollment(ReenrollmentJobConfiguration config, Submit
                 };
             }
             finally
-            { 
-                _psHelper.Terminate(); 
+            {
+                if (_psHelper != null)
+                {
+                    _psHelper.Terminate();
+                }
             }
-
         }
 
         private string CreateCSR(string subjectText, string providerName, string keyType, int keySize, string SAN)
@@ -183,9 +205,9 @@ private string CreateCSR(string subjectText, string providerName, string keyType
                     { "keyLength", keySize },
                     { "SAN", SAN }
                 };
-                _logger.LogTrace("Attempting to execute PS function (New-CsrEnrollment)");
+                _logger.LogInformation("Attempting to execute PS function (New-CsrEnrollment)");
                 _results = _psHelper.ExecutePowerShell("New-CsrEnrollment", parameters);
-                _logger.LogTrace("Returned from executing PS function (New-CsrEnrollment)");
+                _logger.LogInformation("Returned from executing PS function (New-CsrEnrollment)");
 
                 // This should return the CSR that was generated
                 if (_results == null || _results.Count == 0)

IISU/ImplementedStoreTypes/Win/Inventory.cs

@@ -128,7 +128,7 @@ public List<CurrentInventoryItem> QueryWinCertCertificates(RemoteSettings settin
                 {
                     { "StoreName", StoreName }
                 };
-                
+
                 results = ps.ExecutePowerShell("Get-KFCertificates", parameters);
 
                 // If there are certificates, deserialize the results and send them back to command
@@ -148,7 +148,7 @@ public List<CurrentInventoryItem> QueryWinCertCertificates(RemoteSettings settin
                         Inventory.Add(
                             new CurrentInventoryItem
                             {
-                                Certificates = new[] { cert.Base64Data},
+                                Certificates = new[] { cert.Base64Data },
                                 Alias = cert.Thumbprint,
                                 PrivateKeyEntry = cert.HasPrivateKey,
                                 UseChainLevel = false,

IISU/ImplementedStoreTypes/Win/Management.cs

@@ -25,6 +25,7 @@
 using System.Collections.ObjectModel;
 using System.Collections.Generic;
 using System.Management.Automation.Runspaces;
+using System.Security.Cryptography.X509Certificates;
 
 namespace Keyfactor.Extensions.Orchestrator.WindowsCertStore.WinCert
 {
@@ -153,7 +154,7 @@ public JobResult AddCertificate(string certificateContents, string privateKeyPas
                     if (!string.IsNullOrEmpty(privateKeyPassword)) { parameters.Add("PrivateKeyPassword", privateKeyPassword); }
                     if (!string.IsNullOrEmpty(cryptoProvider)) { parameters.Add("CryptoServiceProvider", cryptoProvider); }
 
-                    _results = _psHelper.ExecutePowerShell("Add-KFCertificateToStore", parameters);
+                    _results = _psHelper.ExecutePowerShell("Add-KFCertificateToStore ", parameters);
                     _logger.LogTrace("Returned from executing PS function (Add-KFCertificateToStore)");
 
                     // This should return the thumbprint of the certificate