logging full raw response, updated serialization config to ignore null values

Author: joevanwanzeeleKF

hashicorp-vault-cagateway/APIProxy/CertResponse.cs

@@ -18,6 +18,9 @@ public class CertResponse
         [JsonPropertyName("revocation_time_rfc3339")]
         public DateTime? RevocationTime { get; set; }
 
+        [JsonPropertyName("revocation_time")]
+        public int RevocationTimestamp { get; set; }
+
         [JsonPropertyName("issuer_id")]
         public string IssuerId { get; set; }
     }

hashicorp-vault-cagateway/Client/VaultHttp.cs

@@ -14,6 +14,7 @@
 using System.Collections.Generic;
 using System.Text.Json;
 using System.Text.Json.Serialization;
+using System.Threading;
 using System.Threading.Tasks;
 
 namespace Keyfactor.Extensions.CAPlugin.HashicorpVault.Client
@@ -35,10 +36,9 @@ public VaultHttp(string host, string mountPoint, string authToken, string nameSp
 
             _serializerOptions = new()
             {
-                DefaultIgnoreCondition = JsonIgnoreCondition.Never,
-                PropertyNameCaseInsensitive = true,
-                RespectNullableAnnotations = true,
-                PreferredObjectCreationHandling = JsonObjectCreationHandling.Replace                
+                DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull,
+                PropertyNameCaseInsensitive = true,                
+                PreferredObjectCreationHandling = JsonObjectCreationHandling.Populate
             };
 
             var restClientOptions = new RestClientOptions($"{host.TrimEnd('/')}/v1") { ThrowOnAnyError = true  };
@@ -69,15 +69,15 @@ public VaultHttp(string host, string mountPoint, string authToken, string nameSp
         public async Task<T> GetAsync<T>(string path, Dictionary<string, string> parameters = null)
         {
             logger.MethodEntry();
-            logger.LogTrace($"preparing to send GET request to {path} with parameters {JsonSerializer.Serialize(parameters)}");
+            logger.LogTrace($"preparing to send GET request to {_mountPoint}/{path} with parameters {JsonSerializer.Serialize(parameters)}");
 
             try
             {
                 var request = new RestRequest($"{_mountPoint}/{path}", Method.Get);
                 if (parameters != null && parameters.Keys.Count > 0) { request.AddJsonBody(parameters); }
                 var response = await _restClient.ExecuteGetAsync(request);
 
-                logger.LogTrace($"raw response: {response.Content}");
+                logger.LogTrace($"raw response: {JsonSerializer.Serialize(response)}");
 
                 logger.LogTrace($"response status: {response.StatusCode}");
 

hashicorp-vault-cagateway/HashicorpVaultCAConnector.cs

@@ -301,11 +301,12 @@ public async Task Synchronize(BlockingCollection<AnyCAPluginCertificate> blockin
                     {
                         metaData = await _client.GetCertMetadata(certSerial);
                     }
-                    catch (Exception)
+                    catch (Exception ex)
                     {
-                        logger.LogTrace("an error occurred when attempting to retrieve the metadata, continuing..");
+                        logger.LogTrace($"an error occurred when attempting to retrieve the metadata, continuing.. {LogHandler.FlattenException(ex)}");
                     }
 
+
                     var newCert = new AnyCAPluginCertificate
                     {
                         CARequestID = trackingId,

hashicorp-vault-cagateway/hashicorp-vault-caplugin.csproj

@@ -35,6 +35,10 @@
 	<ItemGroup>
 		<PackageReference Include="BouncyCastle.Cryptography" Version="2.6.2" />
 		<PackageReference Include="Keyfactor.AnyGateway.IAnyCAPlugin" Version="3.1.0" />
+		<PackageReference Include="Keyfactor.AnyGateway.SDK" Version="21.3.2">
+		  <PrivateAssets>all</PrivateAssets>
+		  <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+		</PackageReference>
 		<PackageReference Include="Keyfactor.Logging" Version="1.3.0" />
 		<PackageReference Include="Keyfactor.PKI" Version="8.1.1" />
 		<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="10.0.0" />