ab#76170

Author: Lee Fine

RemoteFile.UnitTests/RemoteFile.UnitTests.csproj

@@ -10,6 +10,7 @@
 
     <ItemGroup>
         <PackageReference Include="BouncyCastle.Cryptography" Version="2.6.2" />
+        <PackageReference Include="Keyfactor.Orchestrators.IOrchestratorJobExtensions" Version="1.0.0" />
         <PackageReference Include="Keyfactor.PKI" Version="8.1.1" />
         <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
         <PackageReference Include="xunit" Version="2.4.1" />

RemoteFile/ReenrollmentBase.cs

@@ -13,6 +13,7 @@
 using Keyfactor.Orchestrators.Common.Enums;
 
 using Microsoft.Extensions.Logging;
+using static Keyfactor.PKI.PKIConstants.X509;
 
 namespace Keyfactor.Extensions.Orchestrator.RemoteFile
 {
@@ -47,9 +48,22 @@ public JobResult ProcessJobToDo(ReenrollmentJobConfiguration config, SubmitReenr
             {
                 SetJobProperties(config, config.CertificateStoreDetails, logger);
 
-                string alias = config.;
-                string sans = "reenroll2.Keyfactor.com&reenroll1.keyfactor.com&reenroll3.Keyfactor.com";
-                bool overwrite = true;
+                bool overwrite = config.Overwrite;
+                string alias = config.Alias;
+                string sans = "";
+                if (config.SANs.Count > 0)
+                {
+                    foreach (KeyValuePair<string, string[]> keyValue in config.SANs)
+                    {
+                        string key = keyValue.Key.Replace("ip4", "ip", StringComparison.OrdinalIgnoreCase).Replace("ip6", "ip", StringComparison.OrdinalIgnoreCase).Replace("upn", "uri", StringComparison.OrdinalIgnoreCase);
+                        foreach (string value in keyValue.Value)
+                        {
+                            sans += (key + ":" + value + ",");
+                        }
+                    }
+                    if (sans.Length > 0)
+                        sans = sans.Substring(0, sans.Length - 1);
+                }
 
                 // validate parameters
                 string KeyTypes = string.Join(",", Enum.GetNames(typeof(SupportedKeyTypeEnum)));
@@ -58,9 +72,7 @@ public JobResult ProcessJobToDo(ReenrollmentJobConfiguration config, SubmitReenr
                     throw new RemoteFileException($"Unsupported KeyType value {KeyType}.  Supported types are {KeyTypes}.");
                 }
 
-                ApplicationSettings.FileTransferProtocolEnum fileTransferProtocol = ApplicationSettings.FileTransferProtocol;
-
-                certificateStore = new RemoteCertificateStore(config.CertificateStoreDetails.ClientMachine, UserName, UserPassword, config.CertificateStoreDetails.StorePath, StorePassword, fileTransferProtocol, SSHPort, IncludePortInSPN);
+                certificateStore = new RemoteCertificateStore(config.CertificateStoreDetails.ClientMachine, UserName, UserPassword, config.CertificateStoreDetails.StorePath, StorePassword, SSHPort, IncludePortInSPN);
                 certificateStore.Initialize(SudoImpersonatedUser, UseShellCommands);
 
                 PathFile storePathFile = RemoteCertificateStore.SplitStorePathFile(config.CertificateStoreDetails.StorePath);

RemoteFile/RemoteFile.csproj

@@ -10,7 +10,7 @@
   <ItemGroup>
     <PackageReference Include="BouncyCastle.Cryptography" Version="2.6.2" />
     <PackageReference Include="CliWrap" Version="3.6.6" />
-    <PackageReference Include="Keyfactor.Orchestrators.IOrchestratorJobExtensions" Version="0.7.0" />
+    <PackageReference Include="Keyfactor.Orchestrators.IOrchestratorJobExtensions" Version="1.0.0" />
     <PackageReference Include="Keyfactor.PKI" Version="8.1.1" />
     <PackageReference Include="Microsoft.PowerShell.SDK" Version="7.4.5" />
     <PackageReference Include="SSH.NET" Version="2024.0.0" />