ab#52646

Keyfactor · May 29, 2024 · 757c39a · 757c39a
1 parent e2243be
commit 757c39a
Show file tree

Hide file tree

Showing 11 changed files with 34 additions and 335 deletions.
diff --git a/F5WafOrchestrator/CA/Discovery.cs b/F5WafOrchestrator/CA/Discovery.cs
@@ -6,8 +6,7 @@
 
 namespace Keyfactor.Extensions.Orchestrator.F5WafOrchestrator.CA;
 
-[Job("Discovery")]
-public class Discovery : Job<Discovery>, IDiscoveryJobExtension
+public class Discovery : Job, IDiscoveryJobExtension
 {
     ILogger _logger = LogHandler.GetClassLogger<Discovery>();
 

diff --git a/F5WafOrchestrator/CA/Inventory.cs b/F5WafOrchestrator/CA/Inventory.cs
@@ -20,8 +20,7 @@
 
 namespace Keyfactor.Extensions.Orchestrator.F5WafOrchestrator.CA;
 
-[Job("Inventory")]
-public class Inventory : Job<Inventory>, IInventoryJobExtension
+public class Inventory : Job, IInventoryJobExtension
 {
     private readonly ILogger _logger = LogHandler.GetClassLogger<Inventory>();
 

diff --git a/F5WafOrchestrator/CA/Management.cs b/F5WafOrchestrator/CA/Management.cs
@@ -20,8 +20,7 @@
 
 namespace Keyfactor.Extensions.Orchestrator.F5WafOrchestrator.CA;
 
-[Job("Management")]
-public class Management : Job<Management>, IManagementJobExtension
+public class Management : Job, IManagementJobExtension
 {
     ILogger _logger = LogHandler.GetClassLogger<Management>();
 

diff --git a/F5WafOrchestrator/F5WafClient.cs b/F5WafOrchestrator/F5WafClient.cs
@@ -425,7 +425,11 @@ public string ExtractEndEntityandCertChain(string pfxData, string password)
         string endEntityandChain = "";
 
         byte[] pfxBytes = Convert.FromBase64String(pfxData);
-        Pkcs12Store store = new Pkcs12Store(new MemoryStream(pfxBytes), password.ToCharArray());
+
+        Pkcs12StoreBuilder storeBuilder = new Pkcs12StoreBuilder();
+        Pkcs12Store store = storeBuilder.Build();
+        store.Load(new MemoryStream(pfxBytes), password.ToCharArray());
+
         foreach (string alias in store.Aliases)
         {
             if (store.IsKeyEntry(alias))

diff --git a/F5WafOrchestrator/F5WafJob.cs b/F5WafOrchestrator/F5WafJob.cs
@@ -17,7 +17,7 @@
 
 namespace Keyfactor.Extensions.Orchestrator.F5WafOrchestrator;
 
-public abstract class Job<T> : IOrchestratorJobExtension
+public abstract class Job
 {
     protected F5WafClient F5Client { get; set; }
     public string ExtensionName => "F5Waf";

diff --git a/F5WafOrchestrator/F5WafOrchestrator.csproj b/F5WafOrchestrator/F5WafOrchestrator.csproj
@@ -1,14 +1,17 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
+        <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
         <TargetFramework>net6.0</TargetFramework>
+        <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
         <RootNamespace>Keyfactor.Extensions.Orchestrator.F5WafOrchestrator</RootNamespace>
         <LangVersion>latest</LangVersion>
     </PropertyGroup>
 
     <ItemGroup>
+        <PackageReference Include="BouncyCastle.Cryptography" Version="2.3.0" />
         <PackageReference Include="Keyfactor.Logging" Version="1.1.1" />
         <PackageReference Include="Keyfactor.Orchestrators.IOrchestratorJobExtensions" Version="0.7.0" />
         <PackageReference Include="netvmomi.API" Version="1.0.16" />
@@ -32,11 +35,15 @@
 
     <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
         <DefineConstants></DefineConstants>
-        <BaseOutputPath>C:\Program Files\Keyfactor\Keyfactor Orchestrator\extensions\F5WafOrchestrator</BaseOutputPath>
+        <BaseOutputPath></BaseOutputPath>
         <OutputPath>$(BaseOutputPath)</OutputPath>
         <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
         <AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
 
     </PropertyGroup>
 
+    <Target Name="PreBuild" BeforeTargets="PreBuildEvent">
+      <Exec Command="echo F | xcopy &quot;$(ProjectDir)manifest.json&quot; &quot;$(TargetDir)\manifest.json&quot; /Y" />
+    </Target>
+
 </Project>
diff --git a/F5WafOrchestrator/TLS/Discovery.cs b/F5WafOrchestrator/TLS/Discovery.cs
@@ -6,8 +6,7 @@
 
 namespace Keyfactor.Extensions.Orchestrator.F5WafOrchestrator.TLS;
 
-[Job("Discovery")]
-public class Discovery : Job<Discovery>, IDiscoveryJobExtension
+public class Discovery : Job, IDiscoveryJobExtension
 {
     ILogger _logger = LogHandler.GetClassLogger<Discovery>();
 

diff --git a/F5WafOrchestrator/TLS/Inventory.cs b/F5WafOrchestrator/TLS/Inventory.cs
@@ -20,8 +20,7 @@
 
 namespace Keyfactor.Extensions.Orchestrator.F5WafOrchestrator.TLS;
 
-[Job("Inventory")]
-public class Inventory : Job<Inventory>, IInventoryJobExtension
+public class Inventory : Job, IInventoryJobExtension
 {
     private readonly ILogger _logger = LogHandler.GetClassLogger<Inventory>();
 

diff --git a/F5WafOrchestrator/TLS/Management.cs b/F5WafOrchestrator/TLS/Management.cs
@@ -20,8 +20,7 @@
 
 namespace Keyfactor.Extensions.Orchestrator.F5WafOrchestrator.TLS;
 
-[Job("Management")]
-public class Management : Job<Management>, IManagementJobExtension
+public class Management : Job, IManagementJobExtension
 {
     ILogger _logger = LogHandler.GetClassLogger<Management>();