Merge e711dd8 into e0d1c9e

Author: bhillkeyfactor

AnyAgent/CertManager.cs

@@ -478,7 +478,7 @@ public AnyErrors AddPubCert(AnyJobConfigInfo addPubConfig, CertStoreInfo ci, Nam
 
         private AnyErrors RemoveCertFromDomain(AnyJobConfigInfo removeConfig, CertStoreInfo ci, NamePrefix np)
         {
-            var error = new AnyErrors {HasError = false};
+            var error = new AnyErrors { HasError = false };
             Logger.Trace($"Entering RemoveCertStore for {removeConfig.Job.Alias} ");
             Logger.Trace(
                 $"Entering RemoveCertStore for Domain: {ci.Domain} and Certificate Store: {ci.CertificateStore}");
@@ -535,7 +535,7 @@ private AnyErrors RemoveCertFromDomain(AnyJobConfigInfo removeConfig, CertStoreI
 
         private AnyErrors RemoveFile(AnyJobConfigInfo removeConfig, CertStoreInfo ci, string filename)
         {
-            var error = new AnyErrors {HasError = false};
+            var error = new AnyErrors { HasError = false };
             Logger.Trace($"Entering RemoveFile for {removeConfig.Job.Alias} ");
             Logger.Trace($"Entering RemoveFile for Domain: {ci.Domain} and Certificate Store: {ci.CertificateStore}");
             var apiClient = new ApiClient(removeConfig.Server.Username, removeConfig.Server.Password,
@@ -728,14 +728,14 @@ private void ReplaceCryptoObject(CertStoreInfo ci, string cryptoCertObjectName,
         public InventoryResult GetPublicCerts(ApiClient apiClient)
         {
             var result = new InventoryResult();
-            var error = new AnyErrors {HasError = false};
+            var error = new AnyErrors { HasError = false };
 
             Logger.Trace("GetPublicCerts");
             var viewCert = new ViewPublicCertificatesRequest();
             var viewCertificateCollection = apiClient.ViewPublicCertificates(viewCert);
 
             var intCount = 0;
-            char[] s = {','};
+            char[] s = { ',' };
 
 
             var intMax = Convert.ToInt32(_appConfig.AppSettings.Settings["MaxInventoryCapacity"].Value);
@@ -756,23 +756,22 @@ public InventoryResult GetPublicCerts(ApiClient apiClient)
 
                         Logger.Trace($"Add to List: {pc.Name}");
                         var pem = Convert.FromBase64String(viewCertResponse.File);
-                        var pemString = Encoding.UTF8.GetString(pem);
+
+                        var pemString = Utility.GetPemFromResponse(pem);
+
                         Logger.Trace($"Pem File: {pemString}");
 
                         if (pemString.Contains("BEGIN CERTIFICATE"))
                         {
                             Logger.Trace("Valid Pem File Adding to KF");
-                            var cert = new X509Certificate2(pem);
-                            var b64 = Convert.ToBase64String(cert.Export(X509ContentType.Cert));
-                            Logger.Trace($"Created X509Certificate2: {cert.SerialNumber} : {cert.Subject}");
 
                             if (intCount < intMax)
                             {
-                                if (!blackList.Contains(pc.Name) && cert.Thumbprint != null)
+                                if (!blackList.Contains(pc.Name))
                                     inventoryItems.Add(
                                         new AgentCertStoreInventoryItem
                                         {
-                                            Certificates = new[] {b64},
+                                            Certificates = new[] { pemString },
                                             Alias = pc.Name,
                                             PrivateKeyEntry = false,
                                             ItemStatus = AgentInventoryItemStatus.Unknown,
@@ -807,7 +806,7 @@ public InventoryResult GetPublicCerts(ApiClient apiClient)
         public InventoryResult GetCerts(ApiClient apiClient)
         {
             var result = new InventoryResult();
-            var error = new AnyErrors {HasError = false};
+            var error = new AnyErrors { HasError = false };
 
             Logger.Trace("GetCerts");
             var viewCert = new ViewCryptoCertificatesRequest(apiClient.Domain);

AnyAgent/utility.cs

@@ -13,6 +13,9 @@
 // limitations under the License.
 
 using System;
+using System.Security.Cryptography.X509Certificates;
+using System.Text;
+using CSS.PKI.PEM;
 using DataPower.API.api;
 using Keyfactor.Platform.Extensions.Agents;
 using Newtonsoft.Json;
@@ -37,8 +40,8 @@ public static NamePrefix ParseStoreProperties(AnyJobConfigInfo config)
 
         public static string Base64Encode(string plainText)
         {
-            var plainTextBytes = System.Text.Encoding.UTF8.GetBytes(plainText);
-            return System.Convert.ToBase64String(plainTextBytes);
+            var plainTextBytes = Encoding.UTF8.GetBytes(plainText);
+            return Convert.ToBase64String(plainTextBytes);
         }
 
         public static CertStoreInfo ParseCertificateConfig(AnyJobConfigInfo config)
@@ -83,6 +86,37 @@ public static string ReplaceFirstOccurrence(string source, string find, string r
             return result;
         }
 
+        public static string GetPemFromResponse(byte[] pem)
+        {
+
+            string pemString;
+            try
+            {
+                pemString = PemUtilities.DERToPEM(pem, PemUtilities.PemObjectType.Certificate);
+                var ba = Encoding.ASCII.GetBytes(pemString);
+                var cert = new X509Certificate2(ba);
+            }
+            catch (Exception e)
+            {
+                pemString = String.Empty;
+            }
+
+            if (pemString.Length == 0)
+            {
+                try
+                {
+                    pemString = Encoding.UTF8.GetString(pem);
+                    var ba = Encoding.ASCII.GetBytes(pemString);
+                    var cert = new X509Certificate2(ba);
+                }
+                catch (Exception)
+                {
+                    pemString = String.Empty;
+                }
+            }
+
+            return pemString;
+        }
 
     }
 }