Started removing unnecessary code and files.

Author: Bob Pokorny

IISU/ClientPSCertStoreReEnrollment.cs

@@ -14,6 +14,8 @@
 
 // Ignore Spelling: Keyfactor
 
+// 021225 rcp   Cleaned up and removed unnecessary code
+
 using Keyfactor.Logging;
 using Keyfactor.Orchestrators.Common.Enums;
 using Keyfactor.Orchestrators.Extensions;
@@ -296,254 +298,5 @@ private string ImportCertificate(byte[] certificateRawData, string storeName)
             }
         }
 
-        public JobResult PerformReEnrollmentORIG(ReenrollmentJobConfiguration config, SubmitReenrollmentCSR submitReenrollment, CertStoreBindingTypeENUM bindingType)
-        {
-            bool hasError = false;
-
-            try
-            {
-                _logger.MethodEntry();
-                var serverUserName = PAMUtilities.ResolvePAMField(_resolver, _logger, "Server UserName", config.ServerUsername);
-                var serverPassword = PAMUtilities.ResolvePAMField(_resolver, _logger, "Server Password", config.ServerPassword);
-
-                // Extract values necessary to create remote PS connection
-                JobProperties jobProperties = JsonConvert.DeserializeObject<JobProperties>(config.CertificateStoreDetails.Properties,
-                    new JsonSerializerSettings { DefaultValueHandling = DefaultValueHandling.Populate });
-
-                string protocol = jobProperties.WinRmProtocol;
-                string port = jobProperties.WinRmPort;
-                bool IncludePortInSPN = jobProperties.SpnPortFlag;
-                string clientMachineName = config.CertificateStoreDetails.ClientMachine;
-                string storePath = config.CertificateStoreDetails.StorePath;
-
-                _logger.LogTrace($"Establishing runspace on client machine: {clientMachineName}");
-                using var runSpace = PSHelper.GetClientPsRunspace(protocol, clientMachineName, port, IncludePortInSPN, serverUserName, serverPassword);
-                
-                _logger.LogTrace("Runspace created");
-                runSpace.Open();
-                _logger.LogTrace("Runspace opened");
-
-                PowerShell ps = PowerShell.Create();
-                ps.Runspace = runSpace;
-
-                string CSR = string.Empty;
-
-                var subjectText = config.JobProperties["subjectText"];
-                var providerName = config.JobProperties["ProviderName"];
-                var keyType = config.JobProperties["keyType"];
-                var keySize = config.JobProperties["keySize"];
-                var SAN = config.JobProperties["SAN"];
-
-                Collection<PSObject> results;
-
-                // If the provider name is null, default it to the Microsoft CA
-                providerName ??= "Microsoft Strong Cryptographic Provider";
-
-                // Create the script file
-                ps.AddScript("$infFilename = New-TemporaryFile");
-                ps.AddScript("$csrFilename = New-TemporaryFile");
-
-                ps.AddScript("if (Test-Path $csrFilename) { Remove-Item $csrFilename }");
-
-                ps.AddScript($"Set-Content $infFilename -Value [NewRequest]");
-                ps.AddScript($"Add-Content $infFilename -Value 'Subject = \"{subjectText}\"'");
-                ps.AddScript($"Add-Content $infFilename -Value 'ProviderName = \"{providerName}\"'");
-                ps.AddScript($"Add-Content $infFilename -Value 'MachineKeySet = True'");
-                ps.AddScript($"Add-Content $infFilename -Value 'HashAlgorithm = SHA256'");
-                ps.AddScript($"Add-Content $infFilename -Value 'KeyAlgorithm = {keyType}'");
-                ps.AddScript($"Add-Content $infFilename -Value 'KeyLength={keySize}'");
-                ps.AddScript($"Add-Content $infFilename -Value 'KeySpec = 0'");
-
-                if (SAN != null)
-                {
-                    ps.AddScript($"Add-Content $infFilename -Value '[Extensions]'");
-                    ps.AddScript(@"Add-Content $infFilename -Value '2.5.29.17 = ""{text}""'");
-
-                    foreach (string s in SAN.ToString().Split("&"))
-                    {
-                        ps.AddScript($"Add-Content $infFilename -Value '_continue_ = \"{s + "&"}\"'");
-                    }
-                }
-
-                try
-                {
-                    // Get INF file for debugging
-                    ps.AddScript("$name = $infFilename.FullName");
-                    ps.AddScript("$name");
-                    results = ps.Invoke();
-
-                    string fname = results[0].ToString();
-                    string infContent = File.ReadAllText(fname);
-
-                    _logger.LogDebug($"Contents of {fname}:");
-                    _logger.LogDebug(infContent);
-                }
-                catch (Exception)
-                {
-                }
-
-                // Execute the -new command
-                ps.AddScript($"certreq -new -q $infFilename $csrFilename");
-                _logger.LogDebug($"Subject Text: {subjectText}");
-                _logger.LogDebug($"SAN: {SAN}");
-                _logger.LogDebug($"Provider Name: {providerName}");
-                _logger.LogDebug($"Key Type: {keyType}");
-                _logger.LogDebug($"Key Size: {keySize}");
-                _logger.LogTrace("Attempting to create the CSR by Invoking the script.");
-
-                results = ps.Invoke();
-                _logger.LogTrace("Completed the attempt in creating the CSR.");
-
-                ps.Commands.Clear();
-
-                try
-                {
-                    ps.AddScript($"$CSR = Get-Content $csrFilename -Raw");
-                    _logger.LogTrace("Attempting to get the contents of the CSR file.");
-                    results = ps.Invoke();
-                    _logger.LogTrace("Finished getting the CSR Contents.");
-                }
-                catch (Exception)
-                {
-                    var psError = ps.Streams.Error.ReadAll().Aggregate(String.Empty, (current, error) => current + error.ErrorDetails.Message);
-
-                    hasError = true;
-
-                    throw new CertificateStoreException($"Error creating CSR File. {psError}");
-                }
-                finally
-                {
-                    ps.Commands.Clear();
-
-                    // Delete the temp files
-                    ps.AddScript("if (Test-Path $infFilename) { Remove-Item -Path $infFilename }");
-                    ps.AddScript("if (Test-Path $csrFilename) { Remove-Item -Path $csrFilename }");
-                    _logger.LogTrace("Attempt to delete the temporary files.");
-                    results = ps.Invoke();
-
-                    if (hasError) runSpace.Close();
-                }
-
-                // Get the byte array
-                var RawContent = runSpace.SessionStateProxy.GetVariable("CSR");
-
-                // Sign CSR in Keyfactor
-                _logger.LogTrace("Get the signed CSR from KF.");
-                X509Certificate2 myCert = submitReenrollment.Invoke(RawContent.ToString());
-
-                if (myCert != null)
-                {
-                    // Get the cert data into string format
-                    string csrData = Convert.ToBase64String(myCert.RawData, Base64FormattingOptions.InsertLineBreaks);
-
-                    _logger.LogTrace("Creating the text version of the certificate.");
-
-                    // Write out the cert file
-                    StringBuilder sb = new StringBuilder();
-                    sb.AppendLine("-----BEGIN CERTIFICATE-----");
-                    sb.AppendLine(csrData);
-                    sb.AppendLine("-----END CERTIFICATE-----");
-
-                    ps.AddScript("$cerFilename = New-TemporaryFile");
-                    ps.AddScript($"Set-Content $cerFilename '{sb}'");
-
-                    results = ps.Invoke();
-                    ps.Commands.Clear();
-
-                    // Accept the signed cert
-                    _logger.LogTrace("Attempting to accept or bind the certificate to the HSM.");
-
-                    ps.AddScript($"Set-Location -Path Cert:\\localmachine\\'{config.CertificateStoreDetails.StorePath}'");
-                    ps.AddScript($"Import-Certificate -Filepath $cerFilename");
-                    ps.Invoke();
-                    _logger.LogTrace("Successfully bound the certificate.");
-
-                    ps.Commands.Clear();
-
-                    // Delete the temp files
-                    ps.AddScript("if (Test-Path $infFilename) { Remove-Item -Path $infFilename }");
-                    ps.AddScript("if (Test-Path $csrFilename) { Remove-Item -Path $csrFilename }");
-                    ps.AddScript("if (Test-Path $cerFilename) { Remove-Item -Path $cerFilename }");
-                    _logger.LogTrace("Removing temporary files.");
-                    results = ps.Invoke();
-
-                    ps.Commands.Clear();
-                    runSpace.Close();
-
-                    // Default results
-                    JobResult result = new JobResult
-                    {
-                        Result = OrchestratorJobStatusJobResult.Success,
-                        JobHistoryId = config.JobHistoryId,
-                        FailureMessage = ""
-                    };
-
-                    // Do specific bindings
-                    switch (bindingType)
-                    {
-                        case CertStoreBindingTypeENUM.WinIIS:
-                            // Bind the certificate to IIS
-                            ClientPSIIManager iisManager = new ClientPSIIManager(config, serverUserName, serverPassword);
-                            result = iisManager.BindCertificate(myCert);
-                            // Provide logging information
-                            if (result.Result == OrchestratorJobStatusJobResult.Success) { _logger.LogInformation("Certificate was successfully bound to the IIS Server."); }
-                            else { _logger.LogInformation("There was an issue while attempting to bind the certificate to the IIS Server.  Check the logs for more information."); }
-                            break;
-
-                        case CertStoreBindingTypeENUM.WinSQL:
-
-                            // Bind to SQL Server
-                            ClientPsSqlManager sqlManager = new ClientPsSqlManager(config, serverUserName, serverPassword);
-                            result = sqlManager.BindCertificates("", myCert);
-
-                            // Provide logging information
-                            if (result.Result == OrchestratorJobStatusJobResult.Success) { _logger.LogInformation("Certificate was successfully bound to the SQL Server."); }
-                            else { _logger.LogInformation("There was an issue while attempting to bind the certificate to the SQL Server.  Check the logs for more information."); }
-                            break;
-
-                    }
-
-                    ps.Commands.Clear();
-                    runSpace.Close();
-
-                    return result;
-                }
-                else
-                {
-                    return new JobResult
-                    {
-                        Result = OrchestratorJobStatusJobResult.Failure,
-                        JobHistoryId = config.JobHistoryId,
-                        FailureMessage = "The ReEnrollment job was unable to sign the CSR.  Please check the formatting of the SAN and other ReEnrollment properties."
-                    };
-                }
-
-            }
-            catch (PSRemotingTransportException psEx)
-            {
-                var failureMessage = $"ReEnrollment job failed for Site '{config.CertificateStoreDetails.StorePath}' on server '{config.CertificateStoreDetails.ClientMachine}' with a PowerShell Transport Exception: {psEx.Message}";
-                _logger.LogError(failureMessage + LogHandler.FlattenException(psEx));
-
-                return new JobResult
-                {
-                    Result = OrchestratorJobStatusJobResult.Failure,
-                    JobHistoryId = config.JobHistoryId,
-                    FailureMessage = failureMessage
-                };
-
-            }
-            catch (Exception ex)
-            {
-                var failureMessage = $"ReEnrollment job failed for Site '{config.CertificateStoreDetails.StorePath}' on server '{config.CertificateStoreDetails.ClientMachine}' with error: '{LogHandler.FlattenException(ex)}'";
-                _logger.LogWarning(failureMessage);
-
-                return new JobResult
-                {
-                    Result = OrchestratorJobStatusJobResult.Failure,
-                    JobHistoryId = config.JobHistoryId,
-                    FailureMessage = failureMessage
-                };
-            }
-        }
     }
 }

IISU/ImplementedStoreTypes/Win/Inventory.cs

@@ -12,6 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+// 021225 rcp   Updated and cleaned up unnecessary code
+
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;

IISU/ImplementedStoreTypes/Win/Management.cs

@@ -14,6 +14,8 @@
 
 // Ignore Spelling: Keyfactor
 
+// 021225 rcp   Cleaned up and removed unnecessary code
+
 using Keyfactor.Orchestrators.Common.Enums;
 using Keyfactor.Orchestrators.Extensions;
 using Keyfactor.Orchestrators.Extensions.Interfaces;

IISU/ImplementedStoreTypes/Win/ReEnrollment.cs

@@ -11,6 +11,9 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
+
+// 021225 rcp   Cleaned up and removed unnecessary code
+
 using Keyfactor.Logging;
 using Keyfactor.Orchestrators.Extensions;
 using Keyfactor.Orchestrators.Extensions.Interfaces;