Merge 2.0.1 to main

.github/workflows/keyfactor-release-workflow.yml

@@ -11,10 +11,9 @@ on:
 
 jobs:
   call-starter-workflow:
-    uses: keyfactor/actions/.github/workflows/starter.yml@v3
+    uses: keyfactor/actions/.github/workflows/starter.yml@v5
     secrets:
       token: ${{ secrets.V2BUILDTOKEN}}
-      APPROVE_README_PUSH: ${{ secrets.APPROVE_README_PUSH}}
       gpg_key: ${{ secrets.KF_GPG_PRIVATE_KEY }}
       gpg_pass: ${{ secrets.KF_GPG_PASSPHRASE }}
       scan_token: ${{ secrets.SAST_TOKEN }}

CHANGELOG.md

@@ -1,3 +1,5 @@
+# v2.0.1
+- Added PAM resolution support
 # v2.0.0
 - .Net 6 and .Net 8 Support and Documentation Updates
 # v1.0.0

Kemp.sln

@@ -1,5 +1,4 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
+Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.11.35222.181
 MinimumVisualStudioVersion = 10.0.40219.1

Kemp/Jobs/Inventory.cs

@@ -1,126 +1,133 @@
-using System;
-using System.IO;
-using System.Linq;
-using System.Xml.Serialization;
-using Keyfactor.Extensions.Orchestrator.Kemp.Client;
-using Keyfactor.Extensions.Orchestrator.Kemp.Client.Models;
-using Keyfactor.Logging;
-using Keyfactor.Orchestrators.Common.Enums;
-using Keyfactor.Orchestrators.Extensions;
-using Microsoft.Extensions.Logging;
-using Newtonsoft.Json;
-
-namespace Keyfactor.Extensions.Orchestrator.Kemp.Jobs
-{
-    public class Inventory : IInventoryJobExtension
-    {
-        private readonly ILogger<Inventory> _logger;
-
-        public Inventory(ILogger<Inventory> logger)
-        {
-            _logger = logger;
-        }
-
-        public string ExtensionName => "Kemp";
-
-        public JobResult ProcessJob(InventoryJobConfiguration jobConfiguration,
-            SubmitInventoryUpdate submitInventoryUpdate)
-        {
-            try
-            {
-                _logger.MethodEntry();
-                return PerformInventory(jobConfiguration, submitInventoryUpdate);
-            }
-            catch (Exception e)
-            {
-                _logger.LogError($"Error occured in Inventory.ProcessJob: {LogHandler.FlattenException(e)}");
-                throw;
-            }
-        }
-
-        private JobResult PerformInventory(InventoryJobConfiguration config, SubmitInventoryUpdate submitInventory)
-        {
-            try
-            {
-                _logger.MethodEntry(LogLevel.Debug);
-                _logger.LogTrace($"Inventory Config {JsonConvert.SerializeObject(config)}");
-                _logger.LogTrace(
-                    $"Client Machine: {config.CertificateStoreDetails.ClientMachine} ApiKey: {config.ServerPassword}");
-
-                var client = new KempClient(config);
-
-                var certificatesResult = client.GetCertificates().Result;
-                var intermediateCertificates = client.GetIntermediateCertificates().Result;
-
-                //Debug Write Certificate List Response from Palo Alto
-                var listWriter = new StringWriter();
-                var listSerializer = new XmlSerializer(typeof(CertListResponse));
-                listSerializer.Serialize(listWriter, certificatesResult);
-                _logger.LogTrace($"Certificate List Result {listWriter}");
-
-                //Debug Write Intermediate Certificate List Response from Palo Alto
-                var intListWriter = new StringWriter();
-                var intListSerializer = new XmlSerializer(typeof(CertListResponse));
-                intListSerializer.Serialize(intListWriter, intermediateCertificates);
-                _logger.LogTrace($"Intermediate List Result {intListWriter}");
-
-                var inventoryItems = (from cert in certificatesResult?.Success?.Data?.Certs
-                    let certPem = client.GetCertificate(cert.Name).Result
-                    select BuildInventoryItem(cert.Name, certPem.Success.Data.Certificate, true)).ToList();
-                inventoryItems.AddRange(from cert in intermediateCertificates?.Success?.Data?.Certs
-                    let certPem = client.GetIntermediateCertificate(cert.Name).Result
-                    select BuildInventoryItem(cert.Name, certPem.Success.Data.Certificate, false));
-
-                _logger.LogTrace("Submitting Inventory To Keyfactor via submitInventory.Invoke");
-                submitInventory.Invoke(inventoryItems);
-                _logger.LogTrace("Submitted Inventory To Keyfactor via submitInventory.Invoke");
-
-                _logger.MethodExit(LogLevel.Debug);
-
-                _logger.LogTrace("Return Success");
-                return new JobResult
-                {
-                    Result = OrchestratorJobStatusJobResult.Success,
-                    JobHistoryId = config.JobHistoryId,
-                    FailureMessage = ""
-                };
-            }
-            catch (Exception e)
+using Keyfactor.Extensions.Orchestrator.Kemp.Client;
+using Keyfactor.Extensions.Orchestrator.Kemp.Client.Models;
+using Keyfactor.Logging;
+using Keyfactor.Orchestrators.Common.Enums;
+using Keyfactor.Orchestrators.Extensions;
+using Keyfactor.Orchestrators.Extensions.Interfaces;
+using Microsoft.Extensions.Logging;
+using Newtonsoft.Json;
+using System;
+using System.IO;
+using System.Linq;
+using System.Xml.Linq;
+using System.Xml.Serialization;
+using static Org.BouncyCastle.Math.EC.ECCurve;
+
+namespace Keyfactor.Extensions.Orchestrator.Kemp.Jobs
+{
+    public class Inventory : IInventoryJobExtension
+    {
+        public IPAMSecretResolver _resolver;
+        public string ExtensionName => "Kemp";
+        private ILogger _logger;
+
+        public Inventory(IPAMSecretResolver resolver)
+        {
+            _resolver = resolver;
+        }
+
+        public JobResult ProcessJob(InventoryJobConfiguration jobConfiguration, SubmitInventoryUpdate submitInventoryUpdate)
+        {
+            _logger = LogHandler.GetClassLogger(this.GetType());
+            _logger.MethodEntry();
+
+            try
             {
-                return new JobResult
-                {
-                    Result = OrchestratorJobStatusJobResult.Failure,
-                    JobHistoryId = config.JobHistoryId,
-                    FailureMessage = LogHandler.FlattenException(e)
-                };
-            }
-        }
-
-        protected virtual CurrentInventoryItem BuildInventoryItem(string alias, string certPem, bool privateKey)
-        {
-            try
-            {
-                _logger.MethodEntry();
-                _logger.LogTrace($"Alias: {alias} Pem: {certPem} PrivateKey: {privateKey}");
-
-
-                var acsi = new CurrentInventoryItem
-                {
-                    Alias = alias,
-                    Certificates = new[] {certPem},
-                    ItemStatus = OrchestratorInventoryItemStatus.Unknown,
-                    PrivateKeyEntry = privateKey,
-                    UseChainLevel = false
-                };
-
-                _logger.MethodExit();
-                return acsi;
-            }
-            catch (Exception e)
-            {
-                _logger.LogError($"Error Occurred in Inventory.BuildInventoryItem: {LogHandler.FlattenException(e)}");
-                throw;
-            }
-        }
-    }
+                string password = PAMUtilities.ResolvePAMField(_resolver, _logger, "Kemp ApiKey", jobConfiguration.ServerPassword);
+                jobConfiguration.ServerPassword = password;
+
+                return PerformInventory(jobConfiguration, submitInventoryUpdate);
+            }
+            catch (Exception e)
+            {
+                _logger.LogError($"Error occured in Inventory.ProcessJob: {LogHandler.FlattenException(e)}");
+                throw;
+            }
+        }
+
+        private JobResult PerformInventory(InventoryJobConfiguration config, SubmitInventoryUpdate submitInventory)
+        {
+            try
+            {
+                _logger.MethodEntry(LogLevel.Debug);
+
+                _logger.LogTrace(
+                    $"Client Machine: {config.CertificateStoreDetails.ClientMachine} ApiKey: *********");
+
+                var client = new KempClient(config);
+
+                var certificatesResult = client.GetCertificates().Result;
+                var intermediateCertificates = client.GetIntermediateCertificates().Result;
+
+                //Debug Write Certificate List Response from Palo Alto
+                var listWriter = new StringWriter();
+                var listSerializer = new XmlSerializer(typeof(CertListResponse));
+                listSerializer.Serialize(listWriter, certificatesResult);
+                _logger.LogTrace($"Certificate List Result {listWriter}");
+
+                //Debug Write Intermediate Certificate List Response from Palo Alto
+                var intListWriter = new StringWriter();
+                var intListSerializer = new XmlSerializer(typeof(CertListResponse));
+                intListSerializer.Serialize(intListWriter, intermediateCertificates);
+                _logger.LogTrace($"Intermediate List Result {intListWriter}");
+
+                var inventoryItems = (from cert in certificatesResult?.Success?.Data?.Certs
+                    let certPem = client.GetCertificate(cert.Name).Result
+                    select BuildInventoryItem(cert.Name, certPem.Success.Data.Certificate, true)).ToList();
+                inventoryItems.AddRange(from cert in intermediateCertificates?.Success?.Data?.Certs
+                    let certPem = client.GetIntermediateCertificate(cert.Name).Result
+                    select BuildInventoryItem(cert.Name, certPem.Success.Data.Certificate, false));
+
+                _logger.LogTrace("Submitting Inventory To Keyfactor via submitInventory.Invoke");
+                submitInventory.Invoke(inventoryItems);
+                _logger.LogTrace("Submitted Inventory To Keyfactor via submitInventory.Invoke");
+
+                _logger.MethodExit(LogLevel.Debug);
+
+                _logger.LogTrace("Return Success");
+                return new JobResult
+                {
+                    Result = OrchestratorJobStatusJobResult.Success,
+                    JobHistoryId = config.JobHistoryId,
+                    FailureMessage = ""
+                };
+            }
+            catch (Exception e)
+            {
+                return new JobResult
+                {
+                    Result = OrchestratorJobStatusJobResult.Failure,
+                    JobHistoryId = config.JobHistoryId,
+                    FailureMessage = LogHandler.FlattenException(e)
+                };
+            }
+        }
+
+        protected virtual CurrentInventoryItem BuildInventoryItem(string alias, string certPem, bool privateKey)
+        {
+            try
+            {
+                _logger.MethodEntry();
+                _logger.LogTrace($"Alias: {alias} Pem: {certPem} PrivateKey: *******");
+
+
+                var acsi = new CurrentInventoryItem
+                {
+                    Alias = alias,
+                    Certificates = new[] {certPem},
+                    ItemStatus = OrchestratorInventoryItemStatus.Unknown,
+                    PrivateKeyEntry = privateKey,
+                    UseChainLevel = false
+                };
+
+                _logger.MethodExit();
+                return acsi;
+            }
+            catch (Exception e)
+            {
+                _logger.LogError($"Error Occurred in Inventory.BuildInventoryItem: {LogHandler.FlattenException(e)}");
+                throw;
+            }
+        }
+    }
 }