checking for null responses, specifying culture when parsing datetime.

Author: joevanwanzeeleKF

hashicorp-vault-cagateway/Client/HashicorpVaultClient.cs

@@ -205,7 +205,7 @@ public async Task<List<string>> GetAllCertSerialNumbers()
             try
             {
                 var res = await _vaultHttp.GetAsync<WrappedResponse<KeyedList>>("certs/?list=true");
-                return res.Data?.Entries;
+                return res?.Data?.Entries;
             }
             catch (Exception ex)
             {
@@ -222,7 +222,7 @@ private async Task<List<string>> GetRevokedSerialNumbers()
             try
             {
                 var res = await _vaultHttp.GetAsync<WrappedResponse<KeyedList>>("certs/revoked");
-                keys = res.Data?.Entries;
+                keys = res?.Data?.Entries;
             }
             catch (Exception ex)
             {

hashicorp-vault-cagateway/Client/VaultHttp.cs

@@ -123,7 +123,7 @@ public async Task<T> PostAsync<T>(string path, dynamic parameters = default)
                 if (parameters != null)
                 {
                     string serializedParams = JsonSerializer.Serialize(parameters);
-                    logger.LogTrace($"deserialized parameters (from {parameters.GetType()?.Name}): {serializedParams}");
+                    logger.LogTrace($"serialized parameters (from {parameters.GetType()?.Name}): {serializedParams}");
                     request.AddJsonBody(serializedParams);
                 }
 

hashicorp-vault-cagateway/HashicorpVaultCAConnector.cs

@@ -19,6 +19,7 @@
 using System.Threading;
 using System.Threading.Tasks;
 using System.Reflection;
+using System.Runtime.ConstrainedExecution;
 
 namespace Keyfactor.Extensions.CAPlugin.HashicorpVault
 {
@@ -315,7 +316,7 @@ public async Task Synchronize(BlockingCollection<AnyCAPluginCertificate> blockin
                         Status = !string.IsNullOrEmpty(certFromVault.RevocationTime) ? (int)EndEntityStatus.REVOKED : (int)EndEntityStatus.GENERATED,
                         RevocationDate = !string.IsNullOrEmpty(certFromVault.RevocationTime) ? DateTime.Parse(certFromVault.RevocationTime) : null
                     };
-                    
+
                     // if we were able to get the role name from metadata, we include it
                     if (!string.IsNullOrEmpty(metaData?.Role))
                     {
@@ -342,19 +343,19 @@ public async Task Synchronize(BlockingCollection<AnyCAPluginCertificate> blockin
                     var revoked = !string.IsNullOrEmpty(certFromVault.RevocationTime);
                     logger.LogTrace($"revocationTime = {certFromVault.RevocationTime} so the cert will be marked as{(revoked ? "" : " not")} revoked.");
                     var vaultStatus = revoked ? (int)EndEntityStatus.REVOKED : (int)EndEntityStatus.GENERATED;
-                    
+
                     if (vaultStatus != dbStatus) // if there is a mismatch, we need to update
                     {
                         var newCert = new AnyCAPluginCertificate
                         {
                             CARequestID = trackingId,
                             Certificate = certFromVault.Certificate,
                             Status = vaultStatus,
-                            RevocationDate = !string.IsNullOrEmpty(certFromVault.RevocationTime) ? DateTime.Parse(certFromVault.RevocationTime) : null,                            
+                            RevocationDate = certFromVault.RevocationTime != null ? DateTime.Parse(certFromVault.RevocationTime.ToString(), System.Globalization.CultureInfo.InvariantCulture, System.Globalization.DateTimeStyles.AdjustToUniversal | System.Globalization.DateTimeStyles.AssumeUniversal) : null
                             // ProductID is not available via the API after the initial issuance.  we do not want to overwrite                            
-                        };                    
-                        
-                        blockingBuffer.Add(newCert);
+                        };
+
+                        blockingBuffer.Add(newCert, cancelToken);
                     }
                 }
                 count++;